DroidTvSettings: use Merged AndroidManifest xml for tv propject[2/3]

PD# 163683

use Merged AndroidManifest xml for tv propject
git commit -a -m

Change-Id: Iaed25ec16cc687af8b8314232d4de9257de932be

2 files changed, 33 insertions, 0 deletions

diff --git a/files/DroidTvSettings/AndroidManifest-common.xml b/files/DroidTvSettings/AndroidManifest-common.xml
new file mode 100755
index 0000000..d3a572e
--- a/dev/null
+++ b/files/DroidTvSettings/AndroidManifest-common.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /* Copyright (c) 2014 Amlogic, Inc. All rights reserved.
+**
+** This source code is subject to the terms and conditions defined in the
+** file 'LICENSE' which is part of this source code package.
+**
+** Description: manifest
+*/
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    package="com.droidlogic.tv.settings"
+    android:sharedUserId="android.uid.system"
+    android:versionCode="1"
+    coreApp="true"
+    android:versionName="1.0" >
+    <application
+        android:banner="@drawable/ic_launcher_banner_settings"
+        android:defaultToDeviceProtectedStorage="true"
+        android:directBootAware="true"
+        android:icon="@drawable/logo_settings_color_48dp"
+        android:label="@string/settings_app_name"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Settings"
+        android:usesCleartextTraffic="true" >
+
+        <uses-library android:name="droidlogic.tv.software.core" />
+    </application>
+</manifest>
diff --git a/system.prop b/system.prop
index 957d50b..9bfd5e9 100644
--- a/system.prop
+++ b/system.prop
@@ -102,3 +102,6 @@ mbx.hdmiin.videolayer=false
 
 #adb
 service.adb.tcp.port=5555
+
+#for Tv
+ro.platform.has.tvuimode=true