Update Android code to support SDK 7

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

vlc-android/AndroidManifest.xml

@@ -2,12 +2,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     android:versionCode="1"
     android:versionName="0.0-alpha"
-    package="org.videolan.vlc.android"
-    android:installLocation="auto">
-    <uses-sdk android:minSdkVersion="8" />
+    package="org.videolan.vlc.android">
+    <uses-sdk android:minSdkVersion="7" />
     <application
         android:icon="@drawable/icon"
-        android:label="@string/app_name">
+        android:label="@string/app_name" android:debuggable="true">
         <activity
             android:label="@string/app_name"
             android:icon="@drawable/icon"

vlc-android/build.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project name="VLC" default="default">
+<project name="VLC" default="help">
 
-<!-- The local.properties file is created and updated by the 'android'
-     tool.
-     It contains the path to the SDK. It should *NOT* be checked into
-     Version Control Systems. -->
-    <property file="local.properties" />
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <loadproperties srcFile="local.properties" />
 
-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the
-         default property values used by the Ant rules.
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
          Here are some properties you may want to change/update:
 
          source.dir
@@ -17,6 +16,9 @@
          out.dir
              The name of the output directory. Default is 'bin'.
 
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
          Properties related to the SDK location or the project target should
          be updated using the 'android' tool with the 'update' action.
 
@@ -24,28 +26,25 @@
          application and should be checked into Version Control Systems.
 
          -->
-    <property file="build.properties" />
+    <property file="ant.properties" />
 
-    <!-- The default.properties file is created and updated by the 'android'
+    <!-- The project.properties file is created and updated by the 'android'
          tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
          This file is an integral part of the build system for your
          application and should be checked into Version Control Systems. -->
-    <property file="project.properties" />
-
-    <!-- Custom Android task to deal with the project target, and import the
-         proper rules.
-         This requires ant 1.6.0 or above. -->
-    <path id="android.antlibs">
-        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
-    </path>
+    <loadproperties srcFile="project.properties" />
 
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs" />
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+            unless="sdk.dir"
+    />
 
-	<target name="default" />
 
 <!-- extension targets. Uncomment the ones where you want to do custom work
      in between standard targets -->
@@ -55,32 +54,32 @@
     <target name="-pre-compile">
     </target>
 
-    [This is typically used for code obfuscation.
-     Compiled code location: ${out.classes.absolute.dir}
-     If this is not done in place, override ${out.dex.input.absolute.dir}]
+    /* This is typically used for code obfuscation.
+       Compiled code location: ${out.classes.absolute.dir}
+       If this is not done in place, override ${out.dex.input.absolute.dir} */
     <target name="-post-compile">
     </target>
 -->
 
-
-    <!-- Execute the Android Setup task that will setup some properties
-         specific to the target, and import the build rules files.
-
-         The rules file is imported from
-            <SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml
+    <!-- Import the actual build file.
 
          To customize existing targets, there are two options:
          - Customize only one target:
              - copy/paste the target into this file, *before* the
-               <setup> task.
+               <import> task.
              - customize it to your needs.
-         - Customize the whole script.
+         - Customize the whole content of build.xml
              - copy/paste the content of the rules files (minus the top node)
-               into this file, *after* the <setup> task
-             - disable the import of the rules by changing the setup task
-               below to <setup import="false" />.
+               into this file, replacing the <import> task.
              - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
     -->
-    <setup />
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>

vlc-android/project.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-8
+target=android-7

vlc-android/res/layout/audio_browser.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
     android:orientation="vertical">
     <HorizontalScrollView
         android:id="@+id/header"
         android:scrollbars="none"
         android:fadingEdge="none"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_with_shadow">
         <LinearLayout
@@ -59,36 +59,36 @@
         </LinearLayout>
     </HorizontalScrollView>
     <View
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="1dip"
         android:background="#f0f0f0" />
     <org.videolan.vlc.android.widget.FlingViewGroup
         android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
         <ListView
             android:id="@+id/songs_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
             android:fastScrollEnabled="true" />
         <ListView
             android:id="@+id/artists_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
             android:fastScrollEnabled="true" />
         <ListView
             android:id="@+id/albums_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent" />
         <ListView
             android:id="@+id/genres_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
             android:fastScrollEnabled="true" />
         <ListView
             android:id="@+id/playklists_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
             android:fastScrollEnabled="true" />
     </org.videolan.vlc.android.widget.FlingViewGroup>
 </LinearLayout>

vlc-android/res/layout/audio_player.xml

@@ -2,26 +2,26 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
     android:background="@drawable/bg_with_shadow">
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="48dip"
         android:orientation="horizontal"
         android:background="@drawable/header">
         <ImageView
             android:src="@drawable/header_logo"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="fill_parent"
             android:scaleType="centerInside" />
     </LinearLayout>
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="0dip"
         android:layout_weight="1">
         <ImageView
-            android:layout_height="match_parent"
+            android:layout_height="fill_parent"
             android:layout_width="0dip"
             android:layout_weight="1"
             android:background="#00ffffff"
@@ -30,7 +30,7 @@
             android:id="@+id/cover" />
         <LinearLayout
             android:layout_width="90dip"
-            android:layout_height="match_parent"
+            android:layout_height="fill_parent"
             android:gravity="bottom"
             android:paddingLeft="15dip"
             android:orientation="vertical">
@@ -58,7 +58,7 @@
     <LinearLayout
         android:orientation="horizontal"
         android:layout_height="wrap_content"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_marginLeft="15dip"
         android:layout_marginTop="10dip"
         android:layout_marginRight="15dip">
@@ -81,7 +81,7 @@
             android:id="@+id/length" />
     </LinearLayout>
     <SeekBar
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:minHeight="4dip"
         android:maxHeight="4dip"
@@ -93,7 +93,7 @@
         android:paddingRight="15dip"
         android:id="@+id/timeline" />
     <TextView
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:text="@string/title"
         android:textColor="#ffffff"
@@ -105,7 +105,7 @@
         android:layout_marginBottom="4dip"
         android:id="@+id/title" />
     <TextView
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:text="@string/artist"
         android:textColor="#888888"
@@ -117,7 +117,7 @@
         android:layout_marginBottom="4dip"
         android:id="@+id/artist" />
     <TextView
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:text="@string/album"
         android:textColor="#888888"
@@ -128,7 +128,7 @@
         android:ellipsize="marquee"
         android:id="@+id/album" />
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center"

vlc-android/res/layout/audio_player_mini.xml

@@ -2,20 +2,20 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="match_parent"
+    android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/bg_with_shadow">
     <SeekBar
         android:id="@+id/timeline"
         android:layout_height="wrap_content"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:minHeight="2dip"
         android:maxHeight="2dip"
         android:progressDrawable="@drawable/po_seekbar"
         android:thumb="@drawable/spacer" />
     <LinearLayout
         android:id="@+id/mini_player"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="60dip"
         android:orientation="horizontal"
         android:gravity="center_vertical">

vlc-android/res/layout/browser.xml

@@ -4,7 +4,7 @@
               android:layout_height="fill_parent"
               android:orientation="vertical">
     <ListView android:id="@id/android:list"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
               />
 </LinearLayout>
\ No newline at end of file

vlc-android/res/layout/browser_item.xml

@@ -2,7 +2,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="match_parent"
+    android:layout_height="fill_parent"
     android:paddingLeft="5dip"
     android:paddingTop="5dip"
     android:paddingBottom="5dip">

vlc-android/res/layout/info_dialog.xml

@@ -6,7 +6,7 @@
     android:layout_height="fill_parent"
     android:weightSum="1">
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="#444444"
         android:gravity="center_vertical"
@@ -25,17 +25,17 @@
             android:text="@string/info_title" />
     </LinearLayout>
     <TextView
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:text="@string/beta_warning"
         android:padding="10dip" />
     <View
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="0dip"
         android:layout_weight="1" />
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center_vertical"
@@ -54,7 +54,7 @@
             android:text="@string/not_show_again" />
     </LinearLayout>
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center_horizontal"

vlc-android/res/layout/list_header.xml

@@ -2,18 +2,18 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
     android:background="@drawable/bg_with_shadow">
     <TextView
         android:id="@+id/text"
         android:layout_height="wrap_content"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_marginLeft="18dip"
         android:textSize="16dip"
         android:textColor="#ffffff" />
     <View
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="1dip"
         android:background="#f0f0f0" />
 </LinearLayout>
\ No newline at end of file

vlc-android/res/layout/main.xml

@@ -5,14 +5,14 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="48dip"
         android:orientation="horizontal"
         android:background="@drawable/header">
         <ImageView
             android:src="@drawable/header_logo"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="fill_parent"
             android:scaleType="centerInside" />
         <View
             android:layout_width="0dip"
@@ -70,6 +70,6 @@
     <org.videolan.vlc.android.widget.AudioMiniPlayer
         android:id="@+id/audio_mini_player"
         android:layout_height="wrap_content"
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:visibility="gone" />
 </LinearLayout>

vlc-android/res/layout/media_info.xml

@@ -6,11 +6,11 @@
     android:scrollbars="none">
     <FrameLayout
         android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
             android:gravity="center_horizontal"
             android:paddingTop="60dip">
             <ProgressBar
@@ -20,18 +20,18 @@
         </LinearLayout>
 
         <ImageView
-            android:layout_width="match_parent"
+            android:layout_width="fill_parent"
             android:layout_height="230dip"
             android:id="@+id/image"
             android:scaleType="fitCenter"
             android:visibility="invisible" />
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="fill_parent"