diff --git a/vlc-android/AndroidManifest.xml b/vlc-android/AndroidManifest.xml
index ae5d0bc58abecd2642a6c1b10c03d526669e544a..b3c756ed0da5bd33916ab8eebe1789cf668a275e 100644
--- a/vlc-android/AndroidManifest.xml
+++ b/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"
diff --git a/vlc-android/build.xml b/vlc-android/build.xml
index 4c9de92a8b6bc73faa98ef9783f0834caf932dd2..9240fc7e06c86e859658e3e3ff00c4f21f9c185b 100644
--- a/vlc-android/build.xml
+++ b/vlc-android/build.xml
@@ -1,15 +1,14 @@
 <?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>
diff --git a/vlc-android/project.properties b/vlc-android/project.properties
index ea89160e01308e771e8bfe2bfe4378fc38e093fa..5a7094538fde29178697e765159436dcc0f19f93 100644
--- a/vlc-android/project.properties
+++ b/vlc-android/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-8
+target=android-7
diff --git a/vlc-android/res/layout/audio_browser.xml b/vlc-android/res/layout/audio_browser.xml
index 47361ddf03bfbecc2903a0f149d5aa4ded304e98..967db5b741dddce32712c12104c65457477feff4 100644
--- a/vlc-android/res/layout/audio_browser.xml
+++ b/vlc-android/res/layout/audio_browser.xml
@@ -1,14 +1,14 @@
 <?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>
diff --git a/vlc-android/res/layout/audio_player.xml b/vlc-android/res/layout/audio_player.xml
index 450e1774506d00a1ece987676ae3fbf95eca96a9..3e436c2b838eaab62826d81794d6e901585d408d 100644
--- a/vlc-android/res/layout/audio_player.xml
+++ b/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"
diff --git a/vlc-android/res/layout/audio_player_mini.xml b/vlc-android/res/layout/audio_player_mini.xml
index 8623156bfd5948aa802efe60a30d49c2dbf8c42b..32640cc8183111e4d1435ed5348626a570051590 100644
--- a/vlc-android/res/layout/audio_player_mini.xml
+++ b/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">
diff --git a/vlc-android/res/layout/browser.xml b/vlc-android/res/layout/browser.xml
index c8daead9319659e4cc2e90e2b826f93237b19b15..9a71c91e1ad42aeb08617e7bd40fab0d27bf2e3c 100644
--- a/vlc-android/res/layout/browser.xml
+++ b/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
diff --git a/vlc-android/res/layout/browser_item.xml b/vlc-android/res/layout/browser_item.xml
index 7f195b0d5a16da6b3964865805f8bdca6d5e3994..1b49dc896dc89eaf775fcb315e4a2c072d583ce6 100644
--- a/vlc-android/res/layout/browser_item.xml
+++ b/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">
diff --git a/vlc-android/res/layout/info_dialog.xml b/vlc-android/res/layout/info_dialog.xml
index 6d2ce2e56dec195a522543712976132c5ed58e6d..7d9b9ebecdd4ea721e1044c69ffe4f41fb177977 100644
--- a/vlc-android/res/layout/info_dialog.xml
+++ b/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"
diff --git a/vlc-android/res/layout/list_header.xml b/vlc-android/res/layout/list_header.xml
index cc15bfd150d8435603e0de39abd24884ae324119..26c8f274e8af993396de970d83203d3279ca1543 100644
--- a/vlc-android/res/layout/list_header.xml
+++ b/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
diff --git a/vlc-android/res/layout/main.xml b/vlc-android/res/layout/main.xml
index f86773930107f5b68f7b7a9ce5c26975743b5177..e88935bfdf33efc54c09ae4a5cb588169c21201d 100644
--- a/vlc-android/res/layout/main.xml
+++ b/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>
diff --git a/vlc-android/res/layout/media_info.xml b/vlc-android/res/layout/media_info.xml
index 4de00aa7ba22b52d964a122f95dcea8673090b56..b005b617109d5caf0fe7b0fc7f074f2705dfdafb 100644
--- a/vlc-android/res/layout/media_info.xml
+++ b/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_height="match_parent"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
             android:paddingTop="180dip">
             <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
                 android:orientation="vertical"
                 android:background="#66000000">
                 <TextView
@@ -43,7 +43,7 @@
                     android:layout_marginLeft="10dip" />
                 <TextView
                     android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
+                    android:layout_width="fill_parent"
                     android:gravity="right"
                     android:id="@+id/length"
                     android:layout_marginRight="10dip"
diff --git a/vlc-android/res/layout/player_overlay.xml b/vlc-android/res/layout/player_overlay.xml
index 0eecefa95f9304edf27adf1672f40a3a84b0aac5..91572e5b248930433fd26fff3815e5aa9cf39e05 100644
--- a/vlc-android/res/layout/player_overlay.xml
+++ b/vlc-android/res/layout/player_overlay.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
     <LinearLayout
         android:orientation="horizontal"
         android:layout_height="wrap_content"
-        android:layout_width="match_parent">
+        android:layout_width="fill_parent">
         <TextView
             android:id="@+id/player_overlay_time"
             android:layout_width="0dip"
@@ -29,7 +29,7 @@
             android:paddingRight="10dip" />
     </LinearLayout>
     <SeekBar
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:minHeight="4dip"
         android:maxHeight="4dip"
@@ -43,7 +43,7 @@
     <LinearLayout
         android:orientation="horizontal"
         android:layout_height="wrap_content"
-        android:layout_width="match_parent">
+        android:layout_width="fill_parent">
         <ImageButton
             android:id="@+id/player_overlay_size"
             android:background="@drawable/ic_size"
diff --git a/vlc-android/res/layout/search.xml b/vlc-android/res/layout/search.xml
index efef59c56ac5916deef1fb82953d7eba6dddc3e9..65a0f69672bdc3a604d7e6c2730fb9baeaf5ee2f 100644
--- a/vlc-android/res/layout/search.xml
+++ b/vlc-android/res/layout/search.xml
@@ -5,7 +5,7 @@
     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:paddingTop="5dip"
@@ -32,7 +32,7 @@
     </LinearLayout>
     <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"
         android:fastScrollEnabled="true" />
 </LinearLayout>
diff --git a/vlc-android/res/layout/video_list.xml b/vlc-android/res/layout/video_list.xml
index bb5365d95221a18771095d48e21c4b895b0ebc75..347754fc68ee9cca0471e822bc4146114ee5d374 100644
--- a/vlc-android/res/layout/video_list.xml
+++ b/vlc-android/res/layout/video_list.xml
@@ -1,21 +1,21 @@
 <?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">
     <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"
         android:fastScrollEnabled="true" />
     <FrameLayout
         android:id="@id/android:empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
         <LinearLayout
             android:id="@+id/video_list_empty_loadfile"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
             android:gravity="center">
             <ProgressBar
                 android:layout_width="20dip"
@@ -29,8 +29,8 @@
         </LinearLayout>
         <LinearLayout
             android:id="@+id/video_list_empty_nofile"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
             android:gravity="center"
             android:visibility="invisible">
             <TextView
diff --git a/vlc-android/res/layout/video_list_item.xml b/vlc-android/res/layout/video_list_item.xml
index 68e0bdd35dea5669268d21ad16b108ba33238225..c7a232a58e85f73503cc19b925cf61826f047882 100644
--- a/vlc-android/res/layout/video_list_item.xml
+++ b/vlc-android/res/layout/video_list_item.xml
@@ -40,7 +40,7 @@
     <ImageView
         android:id="@+id/ml_item_more"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="fill_parent"
         android:src="@drawable/ic_next"
         android:paddingRight="12dip"
         android:paddingLeft="5dip" />
diff --git a/vlc-android/res/values/styles.xml b/vlc-android/res/values/styles.xml
index 1670a522d45d6729dd59b33a7d2525b5a8875005..b796b6332a1908f74812f778487e69f91a62b8de 100644
--- a/vlc-android/res/values/styles.xml
+++ b/vlc-android/res/values/styles.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="info_dialog" parent="@android:style/Theme.Dialog">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">fill_parent</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:backgroundDimEnabled">true</item>
         <item name="android:windowNoTitle">true</item>
diff --git a/vlc-android/src/org/videolan/vlc/android/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/android/VideoPlayerActivity.java
index 495f6116d5c583112b4392b6b8602d1b67359129..739702e63807cfd502dd63cabdfea7ce1bdc5235 100644
--- a/vlc-android/src/org/videolan/vlc/android/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/android/VideoPlayerActivity.java
@@ -1,11 +1,14 @@
 package org.videolan.vlc.android;
 
+import java.lang.reflect.Method;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.PixelFormat;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -173,18 +176,28 @@ public class VideoPlayerActivity extends Activity {
     private void lockScreen() {
         WindowManager wm = (WindowManager) getSystemService(WINDOW_SERVICE);
         Display display = wm.getDefaultDisplay();
-
-        switch (display.getRotation()) {
-            case Surface.ROTATION_0:
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-                break;
-            case Surface.ROTATION_90:
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-                break;
-            case Surface.ROTATION_270:
-                // FIXME: API Level 9+ (not tested on a device with API Level < 9)
-                setRequestedOrientation(8); // SCREEN_ORIENTATION_REVERSE_LANDSCAPE
-                break;
+        int rotation = display.getOrientation();
+        if(Build.VERSION.SDK_INT >= 8 /* Android 2.2 has getRotation */) {
+        	try {
+        		Method m = display.getClass().getDeclaredMethod("getRotation");
+            	rotation = (Integer)m.invoke(display);
+        	} catch(Exception e) {
+        		rotation = Surface.ROTATION_0;
+        	}
+        } else {
+        	rotation = display.getOrientation();
+        }
+        switch (rotation) {
+        	case Surface.ROTATION_0:
+        		setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        		break;
+        	case Surface.ROTATION_90:
+        		setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        		break;
+        	case Surface.ROTATION_270:
+        		// FIXME: API Level 9+ (not tested on a device with API Level < 9)
+        		setRequestedOrientation(8); // SCREEN_ORIENTATION_REVERSE_LANDSCAPE
+        		break;
         }
 
         showInfo(R.string.locked, 500);