[Android] Remove package name and version from TV manifest

[Geoffrey Métais]

vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Nov 25 16:35:04 2014 +0100| [13296a51dbb025a4252928acc45476ff33a9eaa4] | committer: Geoffrey Métais

Remove package name and version from TV manifest

To factorize with main manifest.
+ override theme with leanback,
and make sure disabled elements are replaced from main manifest

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=13296a51dbb025a4252928acc45476ff33a9eaa4
---

 vlc-android/tv/AndroidManifest.xml |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/vlc-android/tv/AndroidManifest.xml b/vlc-android/tv/AndroidManifest.xml
index 1271ad9..69ccdde 100644
--- a/vlc-android/tv/AndroidManifest.xml
+++ b/vlc-android/tv/AndroidManifest.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.videolan.vlc"
-    android:installLocation="auto"
-    android:versionCode="9999"
-    android:versionName="1.0.0-git" >
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.videolan.vlc">
 
     <uses-sdk
         android:minSdkVersion="17"
@@ -35,9 +33,11 @@
         android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:logo="@drawable/ic_logo_w"
-        android:theme="@style/Theme.VLC.NoTitleBar" >
+        tools:replace="android:theme"
+        android:theme="@style/Theme.Leanback" >
         <activity
             android:name=".gui.MainActivity"
+            tools:node="replace"
             android:enabled="false"/>
         <activity
             android:name="org.videolan.vlc.gui.tv.MainTvActivity"
@@ -82,6 +82,7 @@
           </intent-filter>
         </receiver>
         <receiver android:name=".RemoteControlClientReceiver"
+            tools:node="replace"
             android:enabled="false"/>
     </application>