From 5ae9f47a834282a745852f7ad22232878e9d378e Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Fri, 8 Jan 2010 15:07:04 -0800
Subject: [PATCH] Deprecate fill_parent and introduce match_parent. Bug:
 #2361749.

---
 res/layout-finger/album_appwidget.xml              | 18 ++++++++--------
 res/layout-finger/audio_player.xml                 | 18 ++++++++--------
 res/layout-finger/audio_player_common.xml          |  6 +++---
 res/layout-finger/buttonbar.xml                    | 10 ++++-----
 res/layout-finger/confirm_delete.xml               |  6 +++---
 res/layout-finger/edit_track_list_item.xml         |  6 +++---
 res/layout-finger/media_picker_activity.xml        |  8 ++++----
 .../media_picker_activity_expanding.xml            |  8 ++++----
 res/layout-finger/music_library.xml                | 22 ++++++++++----------
 res/layout-finger/nowplaying.xml                   | 10 ++++-----
 res/layout-finger/streamstarter.xml                |  2 +-
 res/layout-finger/track_list_item.xml              |  2 +-
 res/layout-finger/track_list_item_child.xml        |  2 +-
 res/layout-finger/track_list_item_group.xml        |  2 +-
 res/layout-finger/weekpicker.xml                   |  4 ++--
 res/layout-keysexposed/create_playlist.xml         |  8 ++++----
 res/layout-keyshidden/create_playlist.xml          | 10 ++++-----
 res/layout-land-finger/audio_player.xml            | 20 +++++++++---------
 res/layout-land-finger/buttonbar.xml               | 12 +++++------
 res/layout-land-finger/media_picker_activity.xml   |  8 ++++----
 .../media_picker_activity_expanding.xml            |  8 ++++----
 res/layout-land-finger/music_library.xml           | 18 ++++++++--------
 res/layout-port-finger-854x480/audio_player.xml    | 16 +++++++--------
 res/layout/music_picker.xml                        | 24 +++++++++++-----------
 res/layout/music_picker_item.xml                   |  2 +-
 res/layout/query_activity.xml                      |  8 ++++----
 res/layout/statusbar.xml                           |  6 +++---
 src/com/android/music/CreatePlaylist.java          |  4 +---
 src/com/android/music/DeleteItems.java             | 13 +-----------
 src/com/android/music/RenamePlaylist.java          |  5 +----
 src/com/android/music/WeekSelector.java            | 12 +----------
 31 files changed, 136 insertions(+), 162 deletions(-)

diff --git a/res/layout-finger/album_appwidget.xml b/res/layout-finger/album_appwidget.xml
index dada130..b5d0908 100644
--- a/res/layout-finger/album_appwidget.xml
+++ b/res/layout-finger/album_appwidget.xml
@@ -15,8 +15,8 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="horizontal"
     android:background="@drawable/appwidget_bg">
 
@@ -24,7 +24,7 @@
         android:id="@+id/album_appwidget"
         android:layout_width="0dip"
         android:layout_weight="3"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:orientation="vertical"
         android:gravity="center_vertical"
         android:clickable="true"
@@ -36,7 +36,7 @@
 
         <TextView
             android:id="@+id/title"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="@color/appwidget_text"
             android:textStyle="bold"
@@ -49,7 +49,7 @@
 
         <TextView
             android:id="@+id/artist"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="@color/appwidget_text"
             android:textSize="14sp"
@@ -62,7 +62,7 @@
     
  	<ImageView
         android:layout_width="1dip"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:background="@drawable/appwidget_divider"
         />
         
@@ -70,7 +70,7 @@
         android:id="@+id/control_play"
         android:layout_width="0dip"
         android:layout_weight="1"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:src="@drawable/ic_appwidget_music_play"
         android:background="@drawable/appwidget_button_center"
         android:scaleType="center"
@@ -78,7 +78,7 @@
 
  	<ImageView
         android:layout_width="1dip"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:background="@drawable/appwidget_divider"
         />
         
@@ -86,7 +86,7 @@
         android:id="@+id/control_next"
         android:layout_width="0dip"
         android:layout_weight="1"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:src="@drawable/ic_appwidget_music_next"
         android:background="@drawable/appwidget_button_right"
         android:scaleType="center"
diff --git a/res/layout-finger/audio_player.xml b/res/layout-finger/audio_player.xml
index da11163..1c7390b 100644
--- a/res/layout-finger/audio_player.xml
+++ b/res/layout-finger/audio_player.xml
@@ -15,12 +15,12 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical">
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
         android:orientation="horizontal"
@@ -63,7 +63,7 @@
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:baselineAligned="false"
@@ -83,13 +83,13 @@
             android:ellipsize="end"
             android:textStyle="bold"
             android:layout_gravity="center_vertical"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:baselineAligned="false"
@@ -108,13 +108,13 @@
             android:singleLine="true"
             android:ellipsize="end"
             android:layout_gravity="center_vertical"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:baselineAligned="false"
@@ -133,7 +133,7 @@
             android:singleLine="true"
             android:ellipsize="end"
             android:layout_gravity="center_vertical"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
     </LinearLayout>
diff --git a/res/layout-finger/audio_player_common.xml b/res/layout-finger/audio_player_common.xml
index 8297fa3..4a7ceca 100644
--- a/res/layout-finger/audio_player_common.xml
+++ b/res/layout-finger/audio_player_common.xml
@@ -17,12 +17,12 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <View 
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="1px"
         android:background="#ffffffff" />
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="#ff5a5a5a"
         android:paddingTop="1dip"
@@ -80,7 +80,7 @@
     <SeekBar android:id="@android:id/progress"
         android:background="#ff5a5a5a"
         style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="36dip"
         android:paddingLeft="8dip"
         android:paddingRight="8dip"
diff --git a/res/layout-finger/buttonbar.xml b/res/layout-finger/buttonbar.xml
index 472889a..8c4e05a 100644
--- a/res/layout-finger/buttonbar.xml
+++ b/res/layout-finger/buttonbar.xml
@@ -19,7 +19,7 @@
 
 <TabWidget xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/buttonbar"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content" >
 
     <TextView
@@ -36,7 +36,7 @@
         android:layout_weight="1"
         android:layout_marginLeft="-3dip"
         android:layout_marginRight="-3dip"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="64dip" />
 
     <TextView
@@ -53,7 +53,7 @@
         android:layout_weight="1"
         android:layout_marginLeft="-3dip"
         android:layout_marginRight="-3dip"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="64dip" />
 
     <TextView
@@ -70,7 +70,7 @@
         android:layout_weight="1"
         android:layout_marginLeft="-3dip"
         android:layout_marginRight="-3dip"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="64dip" />
 
     <TextView
@@ -87,7 +87,7 @@
         android:layout_weight="1"
         android:layout_marginLeft="-3dip"
         android:layout_marginRight="-3dip"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="64dip" />
 
 </TabWidget>
diff --git a/res/layout-finger/confirm_delete.xml b/res/layout-finger/confirm_delete.xml
index 1fdf3fc..508fbdb 100644
--- a/res/layout-finger/confirm_delete.xml
+++ b/res/layout-finger/confirm_delete.xml
@@ -16,11 +16,11 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <TextView android:id="@+id/prompt"
-        android:layout_width="fill_parent" android:layout_height="wrap_content"
+        android:layout_width="match_parent" android:layout_height="wrap_content"
         android:layout_marginLeft="8dip"
         android:layout_marginTop="8dip"
         android:layout_marginBottom="8dip"
@@ -29,7 +29,7 @@
     </TextView>
 
     <RelativeLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="6dip"
         android:background="#ffffff" >
diff --git a/res/layout-finger/edit_track_list_item.xml b/res/layout-finger/edit_track_list_item.xml
index 4b5c02f..5dfa0aa 100644
--- a/res/layout-finger/edit_track_list_item.xml
+++ b/res/layout-finger/edit_track_list_item.xml
@@ -17,19 +17,19 @@
 */
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="64dip"
     android:gravity="bottom"
     android:orientation="vertical"
     android:baselineAligned="false">
 
     <ImageView
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:drawable/divider_horizontal_dark" />
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="64dip"
         android:gravity="center_vertical"
         android:ignoreGravity="@+id/icon">
diff --git a/res/layout-finger/media_picker_activity.xml b/res/layout-finger/media_picker_activity.xml
index 6513dcb..af3d992 100644
--- a/res/layout-finger/media_picker_activity.xml
+++ b/res/layout-finger/media_picker_activity.xml
@@ -15,8 +15,8 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical"
     android:gravity="center_vertical" >
 
@@ -26,8 +26,8 @@
 
     <com.android.music.TouchInterceptor
         android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_weight="1"
         android:textSize="18sp"
         android:drawSelectorOnTop="false"
diff --git a/res/layout-finger/media_picker_activity_expanding.xml b/res/layout-finger/media_picker_activity_expanding.xml
index 17dde1a..4811f64 100644
--- a/res/layout-finger/media_picker_activity_expanding.xml
+++ b/res/layout-finger/media_picker_activity_expanding.xml
@@ -15,8 +15,8 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical"
     android:gravity="center_vertical" >
 
@@ -26,8 +26,8 @@
 
     <ExpandableListView
         android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_weight="1"
         android:textSize="18sp"
         android:drawSelectorOnTop="false"
diff --git a/res/layout-finger/music_library.xml b/res/layout-finger/music_library.xml
index 25737aa..12449f4 100644
--- a/res/layout-finger/music_library.xml
+++ b/res/layout-finger/music_library.xml
@@ -15,12 +15,12 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical">
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
         android:paddingTop="35dip"
@@ -32,7 +32,7 @@
         <LinearLayout
             android:layout_weight="1"
             android:layout_width="0dip"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:orientation="vertical"
             android:layout_marginRight="18dip"
             >
@@ -71,7 +71,7 @@
         <LinearLayout
             android:layout_weight="1"
             android:layout_width="0dip"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:orientation="vertical"
             >
 
@@ -109,20 +109,20 @@
 
     <LinearLayout
         android:id="@+id/nowplaying"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="64dip"
         android:focusable="true"
         android:visibility="invisible"
         android:orientation="vertical">
 
         <ImageView
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:drawable/divider_horizontal_dark" />
 
         <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:orientation="horizontal"
             android:layout_marginLeft="18dip"
             android:layout_marginRight="18dip">
@@ -139,7 +139,7 @@
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:singleLine="true"
                     android:ellipsize="end"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                 />
                 <TextView
@@ -147,7 +147,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:singleLine="true"
                     android:ellipsize="end"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                 />
             </LinearLayout>
diff --git a/res/layout-finger/nowplaying.xml b/res/layout-finger/nowplaying.xml
index 86dde1f..cb780bf 100644
--- a/res/layout-finger/nowplaying.xml
+++ b/res/layout-finger/nowplaying.xml
@@ -19,7 +19,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/nowplaying"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="64dip"
     android:focusable="true"
     android:visibility="gone"
@@ -27,8 +27,8 @@
     android:orientation="vertical">
 
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:orientation="horizontal">
 
         <LinearLayout
@@ -43,7 +43,7 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:singleLine="true"
                 android:ellipsize="end"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
             />
             <TextView
@@ -51,7 +51,7 @@
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:singleLine="true"
                 android:ellipsize="end"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
             />
         </LinearLayout>
diff --git a/res/layout-finger/streamstarter.xml b/res/layout-finger/streamstarter.xml
index 025d889..1f21f7b 100644
--- a/res/layout-finger/streamstarter.xml
+++ b/res/layout-finger/streamstarter.xml
@@ -16,7 +16,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="10dip">
 
diff --git a/res/layout-finger/track_list_item.xml b/res/layout-finger/track_list_item.xml
index aa2cd5d..9b1d703 100644
--- a/res/layout-finger/track_list_item.xml
+++ b/res/layout-finger/track_list_item.xml
@@ -17,7 +17,7 @@
 */
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="64dip"
     android:gravity="center_vertical"
     android:ignoreGravity="@+id/icon">
diff --git a/res/layout-finger/track_list_item_child.xml b/res/layout-finger/track_list_item_child.xml
index 5c1a07b..9398182 100644
--- a/res/layout-finger/track_list_item_child.xml
+++ b/res/layout-finger/track_list_item_child.xml
@@ -17,7 +17,7 @@
 */
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="64dip"
     android:background="@drawable/list_selector"
     android:gravity="center_vertical"
diff --git a/res/layout-finger/track_list_item_group.xml b/res/layout-finger/track_list_item_group.xml
index 8c6f500..79a2de1 100644
--- a/res/layout-finger/track_list_item_group.xml
+++ b/res/layout-finger/track_list_item_group.xml
@@ -17,7 +17,7 @@
 */
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="64dip"
     android:gravity="center_vertical"
     android:ignoreGravity="@+id/icon"
diff --git a/res/layout-finger/weekpicker.xml b/res/layout-finger/weekpicker.xml
index 053a1e2..da49a68 100644
--- a/res/layout-finger/weekpicker.xml
+++ b/res/layout-finger/weekpicker.xml
@@ -21,7 +21,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <TextView
@@ -45,7 +45,7 @@
     
     <!-- Set button -->
     <RelativeLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="6dip"
         android:background="#ffffff" >
diff --git a/res/layout-keysexposed/create_playlist.xml b/res/layout-keysexposed/create_playlist.xml
index 9a91a46..ce25d4b 100644
--- a/res/layout-keysexposed/create_playlist.xml
+++ b/res/layout-keysexposed/create_playlist.xml
@@ -16,11 +16,11 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <TextView android:id="@+id/prompt"
-        android:layout_width="fill_parent" android:layout_height="wrap_content"
+        android:layout_width="match_parent" android:layout_height="wrap_content"
         android:text="@string/create_playlist_create_text_prompt"
         android:layout_marginTop="8dip"
         android:layout_marginBottom="8dip"
@@ -29,7 +29,7 @@
     </TextView>
 
     <EditText android:id="@+id/playlist"
-        android:layout_width="fill_parent" android:layout_height="wrap_content"
+        android:layout_width="match_parent" android:layout_height="wrap_content"
         android:singleLine="true"
         android:layout_marginBottom="8dip"
         android:layout_marginLeft="8dip"
@@ -38,7 +38,7 @@
     </EditText>
 
     <RelativeLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="6dip"
         android:background="#ffffff" >
diff --git a/res/layout-keyshidden/create_playlist.xml b/res/layout-keyshidden/create_playlist.xml
index 675228b..6c8c8b6 100644
--- a/res/layout-keyshidden/create_playlist.xml
+++ b/res/layout-keyshidden/create_playlist.xml
@@ -16,12 +16,12 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <LinearLayout
         android:orientation="horizontal"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dip"
         android:layout_marginTop="8dip"
@@ -34,14 +34,14 @@
             android:src="@drawable/ic_slide_keyboard"/>
 
         <TextView android:id="@+id/prompt"
-            android:layout_width="fill_parent" android:layout_height="wrap_content"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
             android:text="@string/create_playlist_create_text_prompt"
             android:layout_marginLeft="8dip">
         </TextView>
     </LinearLayout>
 
     <EditText android:id="@+id/playlist"
-        android:layout_width="fill_parent" android:layout_height="wrap_content"
+        android:layout_width="match_parent" android:layout_height="wrap_content"
         android:singleLine="true"
         android:visibility="gone"
         android:layout_marginBottom="8dip">
@@ -49,7 +49,7 @@
     </EditText>
 
     <RelativeLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="6dip"
         android:background="#ffffff" >
diff --git a/res/layout-land-finger/audio_player.xml b/res/layout-land-finger/audio_player.xml
index a9c17f1..675f430 100644
--- a/res/layout-land-finger/audio_player.xml
+++ b/res/layout-land-finger/audio_player.xml
@@ -15,14 +15,14 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical">
 
 
     <!-- This is the LinearLayout that contains the album art, function buttons and album/artist/track info -->
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
         android:orientation="horizontal">
@@ -44,7 +44,7 @@
             android:orientation="vertical">
 
             <LinearLayout
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:paddingTop="20dip" >
@@ -68,7 +68,7 @@
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:baselineAligned="false"
@@ -87,13 +87,13 @@
                     android:ellipsize="end"
                     android:textStyle="bold"
                     android:layout_gravity="center_vertical"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
 
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:baselineAligned="false"
@@ -112,13 +112,13 @@
                     android:ellipsize="end"
                     android:textStyle="bold"
                     android:layout_gravity="center_vertical"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
 
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:baselineAligned="false"
@@ -137,7 +137,7 @@
                     android:ellipsize="end"
                     android:textStyle="bold"
                     android:layout_gravity="center_vertical"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
 
             </LinearLayout>
diff --git a/res/layout-land-finger/buttonbar.xml b/res/layout-land-finger/buttonbar.xml
index c7f610f..f27907d 100644
--- a/res/layout-land-finger/buttonbar.xml
+++ b/res/layout-land-finger/buttonbar.xml
@@ -19,7 +19,7 @@
 
 <TabWidget xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/buttonbar"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content" >
 
     <TextView
@@ -36,7 +36,7 @@
         android:layout_weight="1"
         android:layout_marginLeft="-3dip"
         android:layout_marginRight="-3dip"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="64dip" />
 
     <TextView
@@ -53,7 +53,7 @@
         android:layout_weight="1"
         android:layout_marginLeft="-3dip"
         android:layout_marginRight="-3dip"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="64dip" />
 
     <TextView
@@ -70,7 +70,7 @@
         android:layout_weight="1"
         android:layout_marginLeft="-3dip"
         android:layout_marginRight="-3dip"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="64dip" />
 
     <TextView
@@ -87,7 +87,7 @@
         android:layout_weight="1"
         android:layout_marginLeft="-3dip"
         android:layout_marginRight="-3dip"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="64dip" />
 
     <TextView
@@ -104,7 +104,7 @@
         android:layout_weight="1"
         android:layout_marginLeft="3dip"
         android:layout_marginRight="-3dip"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="64dip" />
 
 </TabWidget>
diff --git a/res/layout-land-finger/media_picker_activity.xml b/res/layout-land-finger/media_picker_activity.xml
index 5277356..77a9919 100644
--- a/res/layout-land-finger/media_picker_activity.xml
+++ b/res/layout-land-finger/media_picker_activity.xml
@@ -15,8 +15,8 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical"
     android:gravity="center_vertical" >
 
@@ -26,8 +26,8 @@
 
     <com.android.music.TouchInterceptor
         android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_weight="1"
         android:textSize="18sp"
         android:drawSelectorOnTop="false"
diff --git a/res/layout-land-finger/media_picker_activity_expanding.xml b/res/layout-land-finger/media_picker_activity_expanding.xml
index ac8f220..9386eb8 100644
--- a/res/layout-land-finger/media_picker_activity_expanding.xml
+++ b/res/layout-land-finger/media_picker_activity_expanding.xml
@@ -15,8 +15,8 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical"
     android:gravity="center_vertical" >
 
@@ -26,8 +26,8 @@
 
     <ExpandableListView
         android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_weight="1"
         android:textSize="18sp"
         android:drawSelectorOnTop="false"
diff --git a/res/layout-land-finger/music_library.xml b/res/layout-land-finger/music_library.xml
index 8d912e8..6be8bd4 100644
--- a/res/layout-land-finger/music_library.xml
+++ b/res/layout-land-finger/music_library.xml
@@ -15,12 +15,12 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical">
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
         android:paddingTop="37dip"
@@ -96,20 +96,20 @@
 
     <LinearLayout
         android:id="@+id/nowplaying"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="64dip"
         android:focusable="true"
         android:visibility="invisible"
         android:orientation="vertical">
 
         <ImageView
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:drawable/divider_horizontal_dark" />
 
         <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:orientation="horizontal"
             android:layout_marginLeft="12dip"
             android:layout_marginRight="12dip">
@@ -126,7 +126,7 @@
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:singleLine="true"
                     android:ellipsize="end"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                 />
                 <TextView
@@ -134,7 +134,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:singleLine="true"
                     android:ellipsize="end"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                 />
             </LinearLayout>
diff --git a/res/layout-port-finger-854x480/audio_player.xml b/res/layout-port-finger-854x480/audio_player.xml
index fcb54dd..15b10ea 100644
--- a/res/layout-port-finger-854x480/audio_player.xml
+++ b/res/layout-port-finger-854x480/audio_player.xml
@@ -15,8 +15,8 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical">
 
     <ImageView
@@ -51,7 +51,7 @@
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:baselineAligned="false"
@@ -71,13 +71,13 @@
             android:ellipsize="end"
             android:textStyle="bold"
             android:layout_gravity="center_vertical"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:baselineAligned="false"
@@ -96,13 +96,13 @@
             android:singleLine="true"
             android:ellipsize="end"
             android:layout_gravity="center_vertical"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:baselineAligned="false"
@@ -121,7 +121,7 @@
             android:singleLine="true"
             android:ellipsize="end"
             android:layout_gravity="center_vertical"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
     </LinearLayout>
diff --git a/res/layout/music_picker.xml b/res/layout/music_picker.xml
index f9df172..0f97fcf 100644
--- a/res/layout/music_picker.xml
+++ b/res/layout/music_picker.xml
@@ -17,18 +17,18 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical"
-        android:layout_width="fill_parent" 
-        android:layout_height="fill_parent">
+        android:layout_width="match_parent" 
+        android:layout_height="match_parent">
     
     <FrameLayout
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="0dip"
             android:layout_weight="1">
         
         <LinearLayout android:id="@+id/progressContainer"
                 android:orientation="vertical"
-                android:layout_width="fill_parent" 
-                android:layout_height="fill_parent"
+                android:layout_width="match_parent" 
+                android:layout_height="match_parent"
                 android:gravity="center">
             
             <ProgressBar android:id="@+android:id/progress"
@@ -45,17 +45,17 @@
         </LinearLayout>
             
         <FrameLayout android:id="@+id/listContainer"
-                android:layout_width="fill_parent" 
-                android:layout_height="fill_parent">
+                android:layout_width="match_parent" 
+                android:layout_height="match_parent">
                 
             <ListView android:id="@android:id/list"
-                    android:layout_width="fill_parent" 
-                    android:layout_height="fill_parent"
+                    android:layout_width="match_parent" 
+                    android:layout_height="match_parent"
                     android:drawSelectorOnTop="false"
                     android:fastScrollEnabled="true" />
             <TextView android:id="@android:id/empty"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
                     android:gravity="center"
                     android:text="@string/no_tracks_title"
                     android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -64,7 +64,7 @@
     </FrameLayout>
     
     <RelativeLayout
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:layout_marginTop="1dip"
             android:background="@android:drawable/bottom_bar">
diff --git a/res/layout/music_picker_item.xml b/res/layout/music_picker_item.xml
index b6e40fe..0d0ae21 100644
--- a/res/layout/music_picker_item.xml
+++ b/res/layout/music_picker_item.xml
@@ -18,7 +18,7 @@
 -->
 <com.android.music.CheckableRelativeLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="64dip"
     android:gravity="center_vertical"
     android:ignoreGravity="@+id/radio">
diff --git a/res/layout/query_activity.xml b/res/layout/query_activity.xml
index 72c3513..7575364 100644
--- a/res/layout/query_activity.xml
+++ b/res/layout/query_activity.xml
@@ -15,16 +15,16 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical"
     android:gravity="center_vertical" >
 
     <include layout="@layout/sd_error" />
 
     <ListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:drawSelectorOnTop="false">
     </ListView>
 </LinearLayout>
diff --git a/res/layout/statusbar.xml b/res/layout/statusbar.xml
index 32fdc0b..eee4762 100644
--- a/res/layout/statusbar.xml
+++ b/res/layout/statusbar.xml
@@ -17,8 +17,8 @@
 */
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="horizontal">
 
     <ImageView android:id="@+id/icon"
@@ -29,7 +29,7 @@
     </ImageView>
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
diff --git a/src/com/android/music/CreatePlaylist.java b/src/com/android/music/CreatePlaylist.java
index 9005023..bb541aa 100644
--- a/src/com/android/music/CreatePlaylist.java
+++ b/src/com/android/music/CreatePlaylist.java
@@ -28,8 +28,6 @@ import android.os.Bundle;
 import android.provider.MediaStore;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
-import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -50,7 +48,7 @@ public class CreatePlaylist extends Activity
 
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.create_playlist);
-        getWindow().setLayout(WindowManager.LayoutParams.FILL_PARENT,
+        getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT,
                                     WindowManager.LayoutParams.WRAP_CONTENT);
 
         mPrompt = (TextView)findViewById(R.id.prompt);
diff --git a/src/com/android/music/DeleteItems.java b/src/com/android/music/DeleteItems.java
index 6cb2527..def8a42 100644
--- a/src/com/android/music/DeleteItems.java
+++ b/src/com/android/music/DeleteItems.java
@@ -17,24 +17,13 @@
 package com.android.music;
 
 import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Intent;
-import android.database.Cursor;
 import android.media.AudioManager;
-import android.net.Uri;
 import android.os.Bundle;
-import android.provider.MediaStore;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.TextView;
-import android.widget.Toast;
 
 public class DeleteItems extends Activity
 {
@@ -49,7 +38,7 @@ public class DeleteItems extends Activity
 
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.confirm_delete);
-        getWindow().setLayout(WindowManager.LayoutParams.FILL_PARENT,
+        getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT,
                                     WindowManager.LayoutParams.WRAP_CONTENT);
 
         mPrompt = (TextView)findViewById(R.id.prompt);
diff --git a/src/com/android/music/RenamePlaylist.java b/src/com/android/music/RenamePlaylist.java
index f81e2af..96ceada 100644
--- a/src/com/android/music/RenamePlaylist.java
+++ b/src/com/android/music/RenamePlaylist.java
@@ -18,17 +18,14 @@ package com.android.music;
 
 import android.app.Activity;
 import android.content.ContentResolver;
-import android.content.ContentUris;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.media.AudioManager;
-import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
-import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -52,7 +49,7 @@ public class RenamePlaylist extends Activity
 
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.create_playlist);
-        getWindow().setLayout(WindowManager.LayoutParams.FILL_PARENT,
+        getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT,
                                     WindowManager.LayoutParams.WRAP_CONTENT);
 
         mPrompt = (TextView)findViewById(R.id.prompt);
diff --git a/src/com/android/music/WeekSelector.java b/src/com/android/music/WeekSelector.java
index 69b819f..3288c8a 100644
--- a/src/com/android/music/WeekSelector.java
+++ b/src/com/android/music/WeekSelector.java
@@ -17,22 +17,12 @@
 package com.android.music;
 
 import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.database.Cursor;
 import android.media.AudioManager;
-import android.net.Uri;
 import android.os.Bundle;
-import android.provider.MediaStore;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
 
 public class WeekSelector extends Activity
 {
@@ -45,7 +35,7 @@ public class WeekSelector extends Activity
 
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.weekpicker);
-        getWindow().setLayout(WindowManager.LayoutParams.FILL_PARENT,
+        getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT,
                                     WindowManager.LayoutParams.WRAP_CONTENT);
 
         mWeeks = (VerticalTextSpinner)findViewById(R.id.weeks);
-- 
2.11.0