Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index 9d623f6..9af76d1 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -18,28 +18,28 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/topLayout"
android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:background="@color/black">
<!-- left side: instructions and messages -->
<LinearLayout
android:orientation="vertical"
android:layout_width="0dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_weight="1.0"
>
<!-- header message -->
<TextView android:id="@+id/headerText"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="18sp"/>
<!-- footer can show a message, or confirm / restart buttons -->
<RelativeLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1.0">
@@ -81,7 +81,7 @@
<View
android:background="@*android:drawable/code_lock_left"
android:layout_width="2dip"
- android:layout_height="fill_parent" />
+ android:layout_height="match_parent" />
<!-- right side: lock pattern -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="wrap_content"
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index 6decb14..2da2b9a 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -18,21 +18,21 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/topLayout"
android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:background="@color/black">
<!-- left side: instructions and messages -->
<LinearLayout
android:orientation="vertical"
android:layout_width="0dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_weight="1.0"
>
<!-- header message -->
<TextView android:id="@+id/headerText"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="18sp"/>
@@ -40,13 +40,13 @@
<!-- fill space between header and button below -->
<View
android:layout_weight="1.0"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
/>
<!-- footer message -->
<TextView android:id="@+id/footerText"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="14sp"/>
@@ -55,7 +55,7 @@
<View
android:background="@*android:drawable/code_lock_left"
android:layout_width="2dip"
- android:layout_height="fill_parent" />
+ android:layout_height="match_parent" />
<!-- right side: lock pattern -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="wrap_content"
diff --git a/res/layout/apn_preference_layout.xml b/res/layout/apn_preference_layout.xml
index 2a7c2e9..1694a93 100644
--- a/res/layout/apn_preference_layout.xml
+++ b/res/layout/apn_preference_layout.xml
@@ -16,7 +16,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical">
diff --git a/res/layout/band_mode.xml b/res/layout/band_mode.xml
index e920af0..ddbc7ae 100644
--- a/res/layout/band_mode.xml
+++ b/res/layout/band_mode.xml
@@ -18,12 +18,12 @@
android:orientation="vertical"
android:padding="4dip"
android:gravity="center_horizontal"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<ListView android:id="@+id/band"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:textSize="7sp">
</ListView>
diff --git a/res/layout/battery_history.xml b/res/layout/battery_history.xml
index 5421c40..b46d97b 100644
--- a/res/layout/battery_history.xml
+++ b/res/layout/battery_history.xml
@@ -2,44 +2,44 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/topLayout"
android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<TextView
android:id="@+id/title"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/graphLayout"
android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent" >
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
<Spinner
android:id="@+id/typeSpinner"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:entries="@array/battery_history_type_spinner" />
<Spinner
android:id="@+id/whichSpinner"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:entries="@array/battery_history_which_spinner" />
<ScrollView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" >
<LinearLayout
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView
android:id="@+id/messageText"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textSize="17dp"
@@ -47,7 +47,7 @@
<com.android.settings.battery_history.GraphableButton
android:id="@+id/button0"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
@@ -56,7 +56,7 @@
<com.android.settings.battery_history.GraphableButton
android:id="@+id/button1"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
@@ -65,7 +65,7 @@
<com.android.settings.battery_history.GraphableButton
android:id="@+id/button2"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
@@ -74,7 +74,7 @@
<com.android.settings.battery_history.GraphableButton
android:id="@+id/button3"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
@@ -83,7 +83,7 @@
<com.android.settings.battery_history.GraphableButton
android:id="@+id/button4"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
@@ -92,7 +92,7 @@
<com.android.settings.battery_history.GraphableButton
android:id="@+id/button5"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
@@ -101,7 +101,7 @@
<com.android.settings.battery_history.GraphableButton
android:id="@+id/button6"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
@@ -110,7 +110,7 @@
<com.android.settings.battery_history.GraphableButton
android:id="@+id/button7"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
@@ -126,15 +126,15 @@
android:id="@+id/textLayout"
android:visibility="gone"
android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent" >
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
<ScrollView
- android:layout_width="fill_parent"
- android:layout_height="fill_parent" >
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
<TextView
android:id="@+id/detailsText"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:textSize="17dp"
android:layout_height="1000dp"/>
</ScrollView>
diff --git a/res/layout/bluetooth.xml b/res/layout/bluetooth.xml
index 530cbbe..a4ac1ca 100644
--- a/res/layout/bluetooth.xml
+++ b/res/layout/bluetooth.xml
@@ -19,32 +19,32 @@
-->
<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"
android:paddingLeft="2dip"
android:paddingRight="2dip">
<Button android:id="@+id/enable"
android:textStyle="bold"
android:text="@string/bluetooth_enable_text"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<Button android:id="@+id/scan"
android:textStyle="bold"
android:text="@string/bluetooth_scan_text"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<Button android:id="@+id/settings"
android:textStyle="bold"
android:text="@string/bluetooth_settings_text"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<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>
diff --git a/res/layout/bluetooth_device_info.xml b/res/layout/bluetooth_device_info.xml
index e589103..4178734 100644
--- a/res/layout/bluetooth_device_info.xml
+++ b/res/layout/bluetooth_device_info.xml
@@ -16,20 +16,20 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/scroll_content"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/bluetooth_device_info_alias" />
<TextView android:id="@+id/deviceAlias"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/bluetooth_device_info_no_alias" />
@@ -49,12 +49,12 @@
android:text="@string/bluetooth_device_info_sdp" />
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/bluetooth_device_info" />
<TextView android:id="@+id/deviceInfo"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/bluetooth_device_info_deviceInfo_text" />
</LinearLayout>
diff --git a/res/layout/bluetooth_discoverable.xml b/res/layout/bluetooth_discoverable.xml
index 3673774..fb65453 100644
--- a/res/layout/bluetooth_discoverable.xml
+++ b/res/layout/bluetooth_discoverable.xml
@@ -19,12 +19,12 @@
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent">
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<TextView
android:id="@+id/message"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="20dip"
android:paddingRight="20dip"
diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml
index bcb6f16..16b75fc 100644
--- a/res/layout/bluetooth_pin_entry.xml
+++ b/res/layout/bluetooth_pin_entry.xml
@@ -19,18 +19,18 @@
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent">
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/message"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@@ -40,7 +40,7 @@
<EditText
android:id="@+id/text"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_marginTop="20dip"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
diff --git a/res/layout/bookmark_picker_item.xml b/res/layout/bookmark_picker_item.xml
index fd764ea..a0d71c6 100644
--- a/res/layout/bookmark_picker_item.xml
+++ b/res/layout/bookmark_picker_item.xml
@@ -17,7 +17,7 @@
*/
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingLeft="2dip"
@@ -29,7 +29,7 @@
android:scaleType="fitCenter" />
<TextView android:id="@+id/title"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:paddingLeft="6dip" />
diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml
index 78ab8b4..97c647f 100644
--- a/res/layout/choose_lock_pattern.xml
+++ b/res/layout/choose_lock_pattern.xml
@@ -18,18 +18,18 @@
android:id="@+id/topLayout"
android:orientation="vertical"
android:layout_width="wrap_content"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:background="@color/black">
<!-- takes up all space above button bar at bottom -->
<LinearLayout
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1">
<TextView android:id="@+id/headerText"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
@@ -37,7 +37,7 @@
<View
android:background="@*android:drawable/code_lock_top"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="2dip" />
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="wrap_content"
@@ -46,11 +46,11 @@
<!-- bottom line looks bad when button bar is their too, omit in this case -->
<!--View
android:background="@*android:drawable/code_lock_bottom"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="8dip" /-->
<TextView android:id="@+id/footerText"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
@@ -61,7 +61,7 @@
<LinearLayout style="@android:style/ButtonBar"
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/footerLeftButton"
diff --git a/res/layout/choose_lock_pattern_example.xml b/res/layout/choose_lock_pattern_example.xml
index d1e816c..62a5364 100644
--- a/res/layout/choose_lock_pattern_example.xml
+++ b/res/layout/choose_lock_pattern_example.xml
@@ -16,22 +16,22 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent">
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<ScrollView
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:layout_weight="1">
<LinearLayout
android:orientation="vertical"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
android:padding="5dip">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/lock_example_title"
android:gravity="center_horizontal"
@@ -48,7 +48,7 @@
/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:text="@string/lock_example_message"
@@ -62,7 +62,7 @@
<LinearLayout style="@android:style/ButtonBar"
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/skip_button"
diff --git a/res/layout/choose_lock_pattern_tutorial.xml b/res/layout/choose_lock_pattern_tutorial.xml
index 8eadc01..3032c05 100644
--- a/res/layout/choose_lock_pattern_tutorial.xml
+++ b/res/layout/choose_lock_pattern_tutorial.xml
@@ -16,22 +16,22 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent">
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
<ScrollView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1">
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="5dip">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/lock_title"
@@ -41,7 +41,7 @@
/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginTop="10dip"
@@ -54,7 +54,7 @@
<LinearLayout style="@android:style/ButtonBar"
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/skip_button"
diff --git a/res/layout/compute_sizes.xml b/res/layout/compute_sizes.xml
index b32ba58..88dbfd1 100755
--- a/res/layout/compute_sizes.xml
+++ b/res/layout/compute_sizes.xml
@@ -16,15 +16,15 @@
<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">
<ListView
android:id="@android:id/list"
android:drawSelectorOnTop="false"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView android:id="@android:id/empty"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="20dip"
android:paddingTop="5dip"
diff --git a/res/layout/confirm_lock_pattern.xml b/res/layout/confirm_lock_pattern.xml
index 52cf24a..01ef5b1 100644
--- a/res/layout/confirm_lock_pattern.xml
+++ b/res/layout/confirm_lock_pattern.xml
@@ -18,11 +18,11 @@
android:id="@+id/topLayout"
android:orientation="vertical"
android:layout_width="wrap_content"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:background="@color/black">
<TextView android:id="@+id/headerText"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1.0"
android:gravity="center"
@@ -30,18 +30,18 @@
<View
android:background="@*android:drawable/code_lock_top"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="2dip" />
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<View
android:background="@*android:drawable/code_lock_bottom"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="8dip" />
<TextView android:id="@+id/footerText"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1.0"
android:gravity="center"
diff --git a/res/layout/credentials_password_dialog.xml b/res/layout/credentials_password_dialog.xml
index c23cc68..440a107 100644
--- a/res/layout/credentials_password_dialog.xml
+++ b/res/layout/credentials_password_dialog.xml
@@ -15,17 +15,17 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<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"
android:padding="15dip">
<TextView android:id="@+id/hint"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/vpn_connect_normal_text_size"
android:text="@string/credentials_first_time_hint"
@@ -33,38 +33,38 @@
android:visibility="gone"/>
<TextView android:id="@+id/error"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/red"
android:textStyle="bold"
android:visibility="gone"/>
<TextView android:id="@+id/old_password_prompt"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/credentials_old_password"
android:visibility="gone"/>
<EditText android:id="@+id/old_password"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:password="True"
android:singleLine="True"
android:visibility="gone"/>
- <TextView android:layout_width="fill_parent"
+ <TextView android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/credentials_new_password" />
<EditText android:id="@+id/new_password"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:password="True"
android:singleLine="True"/>
- <TextView android:layout_width="fill_parent"
+ <TextView android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/credentials_confirm_password" />
<EditText android:id="@+id/confirm_password"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:password="True"
android:singleLine="True"/>
diff --git a/res/layout/credentials_unlock_dialog.xml b/res/layout/credentials_unlock_dialog.xml
index 2ba2ace..a538807 100644
--- a/res/layout/credentials_unlock_dialog.xml
+++ b/res/layout/credentials_unlock_dialog.xml
@@ -15,17 +15,17 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<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"
android:padding="15dip">
<TextView android:id="@+id/hint"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/vpn_connect_normal_text_size"
android:text="@string/credentials_unlock_hint"
@@ -33,14 +33,14 @@
android:visibility="gone"/>
<TextView android:id="@+id/error"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/red"
android:textStyle="bold"
android:visibility="gone"/>
<EditText android:id="@+id/old_password"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:password="True"
android:singleLine="True"/>
diff --git a/res/layout/date_time_settings_setupwizard.xml b/res/layout/date_time_settings_setupwizard.xml
index fc6f5e2..930e199 100644
--- a/res/layout/date_time_settings_setupwizard.xml
+++ b/res/layout/date_time_settings_setupwizard.xml
@@ -15,20 +15,20 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
android:orientation="vertical">
<LinearLayout
android:orientation="vertical"
android:layout_height="0dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_weight="1"
android:gravity="left">
<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:paddingTop="2dip"
/>
@@ -37,7 +37,7 @@
<RelativeLayout
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:background="@android:drawable/bottom_bar">
<Button android:id="@+id/next_button"
diff --git a/res/layout/dialog_edittext.xml b/res/layout/dialog_edittext.xml
index 0dcf673..6b849ac 100644
--- a/res/layout/dialog_edittext.xml
+++ b/res/layout/dialog_edittext.xml
@@ -22,7 +22,7 @@
<EditText
android:id="@+id/edittext"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLength="50"
/>
diff --git a/res/layout/display.xml b/res/layout/display.xml
index 0049025..f35730b 100644
--- a/res/layout/display.xml
+++ b/res/layout/display.xml
@@ -23,22 +23,22 @@
android:orientation="vertical">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/display_font_size_label" />
<Spinner android:id="@+id/fontSize"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
</Spinner>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/display_preview_label" />
<TextView android:id="@+id/preview"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button android:id="@+id/save"
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index 2810604..8da1d76 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -18,12 +18,12 @@
-->
<ScrollView
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">
<LinearLayout
android:id="@+id/all_details"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:paddingRight="6dip"
android:paddingTop="5dip"
android:paddingBottom="5dip"
@@ -31,14 +31,14 @@
<!-- App snippet -->
<RelativeLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical">
<LinearLayout
android:orientation="vertical"
android:layout_alignParentLeft="true"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="6dip"
android:paddingBottom="6dip"
@@ -79,12 +79,12 @@
android:text="@string/storage_label" />
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="6dip"
android:orientation="vertical">
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:baselineAligned="true"
@@ -121,7 +121,7 @@
</LinearLayout>
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:baselineAligned="true"
@@ -158,7 +158,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/info_size"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:baselineAligned="true"
@@ -195,7 +195,7 @@
</LinearLayout>
<!-- Manage space, Clear data/Uninstall buttons -->
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="bottom"
android:orientation="horizontal">
@@ -229,7 +229,7 @@
<!-- Clear cache section -->
<RelativeLayout
android:id="@+id/cache_panel"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView
android:id="@+id/cache_header"
@@ -237,7 +237,7 @@
android:text="@string/cache_header_label" />
<LinearLayout
android:id="@+id/cache_size"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:baselineAligned="true"
@@ -287,13 +287,13 @@
android:text="@string/auto_launch_label" />
<RelativeLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical">
<TextView android:id="@+id/auto_launch"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_alignParentLeft="true"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="6dip"
android:paddingRight="6dip"
@@ -313,7 +313,7 @@
android:text="@string/controls_label" />
<RelativeLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical">
<Button android:id="@+id/force_stop_button"
@@ -329,8 +329,8 @@
<!-- Permissions section -->
<LinearLayout
android:id="@+id/permissions_section"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical">
<TextView
style="?android:attr/listSeparatorTextViewStyle"
@@ -341,12 +341,12 @@
android:paddingTop="6dip"
android:paddingLeft="6dip"
android:paddingBottom="6dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/security_settings_list"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical"/>
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/intent_sender.xml b/res/layout/intent_sender.xml
index 07fe67d..8a85bf8 100644
--- a/res/layout/intent_sender.xml
+++ b/res/layout/intent_sender.xml
@@ -21,13 +21,13 @@
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:paddingBottom="3dip"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<TextView
android:textStyle="bold"
diff --git a/res/layout/list_content_with_empty_view.xml b/res/layout/list_content_with_empty_view.xml
index 324d23f..1d4dcdc 100644
--- a/res/layout/list_content_with_empty_view.xml
+++ b/res/layout/list_content_with_empty_view.xml
@@ -16,18 +16,18 @@
<FrameLayout 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" >
<ListView xmlns:android="http://schemas.android.com/apk/res/android" 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"
/>
<TextView android:id="@+id/empty"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:padding="5dip"
android:gravity="center"
android:visibility="gone" />
diff --git a/res/layout/locale_picker.xml b/res/layout/locale_picker.xml
index 476293f..cc38278 100644
--- a/res/layout/locale_picker.xml
+++ b/res/layout/locale_picker.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_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"
/>
diff --git a/res/layout/locale_picker_in_setupwizard.xml b/res/layout/locale_picker_in_setupwizard.xml
index 184250d..d816f47 100644
--- a/res/layout/locale_picker_in_setupwizard.xml
+++ b/res/layout/locale_picker_in_setupwizard.xml
@@ -16,8 +16,8 @@
<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">
<TextView
android:layout_width="wrap_content"
@@ -29,15 +29,15 @@
/>
<View
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_marginTop="8dip"
android:background="@android:drawable/divider_horizontal_dark"
/>
<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"
/>
diff --git a/res/layout/locale_picker_item.xml b/res/layout/locale_picker_item.xml
index caa6fb5..091419f 100644
--- a/res/layout/locale_picker_item.xml
+++ b/res/layout/locale_picker_item.xml
@@ -17,7 +17,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:padding="5dip">
diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml
index ecefcf5..cdf4c9d 100755
--- a/res/layout/manage_applications_item.xml
+++ b/res/layout/manage_applications_item.xml
@@ -18,7 +18,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
@@ -38,7 +38,7 @@
<LinearLayout
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView android:id="@+id/app_name"
android:layout_width="wrap_content"
diff --git a/res/layout/pick_item.xml b/res/layout/pick_item.xml
index f276511..62fc4f4 100755
--- a/res/layout/pick_item.xml
+++ b/res/layout/pick_item.xml
@@ -15,7 +15,7 @@
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:textAppearance="?android:attr/textAppearanceLargeInverse"
diff --git a/res/layout/power_usage_action_item.xml b/res/layout/power_usage_action_item.xml
index 7b81ec1..a53c551 100644
--- a/res/layout/power_usage_action_item.xml
+++ b/res/layout/power_usage_action_item.xml
@@ -15,7 +15,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
@@ -25,14 +25,14 @@
android:paddingRight="?android:attr/scrollbarSize">
<TextView android:id="@+id/summary"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<!-- Spacer -->
diff --git a/res/layout/power_usage_detail_item_text.xml b/res/layout/power_usage_detail_item_text.xml
index 7ea2432..6c21274 100644
--- a/res/layout/power_usage_detail_item_text.xml
+++ b/res/layout/power_usage_detail_item_text.xml
@@ -16,7 +16,7 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<!--Label for the item-->
<TextView
diff --git a/res/layout/power_usage_details.xml b/res/layout/power_usage_details.xml
index f7485ee..18781a9 100644
--- a/res/layout/power_usage_details.xml
+++ b/res/layout/power_usage_details.xml
@@ -16,18 +16,18 @@
<ScrollView
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">
<LinearLayout
android:id="@+id/all_details"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:paddingTop="5dip"
android:paddingBottom="5dip"
android:orientation="vertical">
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
@@ -73,7 +73,7 @@
android:id="@+id/gauge"
android:background="#80404040"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_marginTop="5dip"
android:layout_below="@id/battery_percentage"
android:layout_gravity="center_vertical" />
@@ -93,7 +93,7 @@
<LinearLayout
android:id="@+id/details"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="6dip"
android:orientation="vertical">
@@ -104,7 +104,7 @@
<LinearLayout
android:id="@+id/controls"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@@ -126,7 +126,7 @@
<LinearLayout
android:id="@+id/packages_section"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="6dip"
android:orientation="vertical">
diff --git a/res/layout/power_usage_package_item.xml b/res/layout/power_usage_package_item.xml
index dcd5aad..750e062 100644
--- a/res/layout/power_usage_package_item.xml
+++ b/res/layout/power_usage_package_item.xml
@@ -16,7 +16,7 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<!--Label for the item-->
<TextView
diff --git a/res/layout/preference_bluetooth.xml b/res/layout/preference_bluetooth.xml
index e832f20..501c827 100644
--- a/res/layout/preference_bluetooth.xml
+++ b/res/layout/preference_bluetooth.xml
@@ -15,7 +15,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
diff --git a/res/layout/preference_dialog_brightness.xml b/res/layout/preference_dialog_brightness.xml
index 071beed..0fa01e4 100644
--- a/res/layout/preference_dialog_brightness.xml
+++ b/res/layout/preference_dialog_brightness.xml
@@ -18,11 +18,11 @@
-->
<ScrollView 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">
<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_horizontal"
android:paddingBottom="20dip">
@@ -33,7 +33,7 @@
android:paddingTop="20dip" />
<CheckBox android:id="@+id/automatic_mode"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/automatic_brightness"
android:textAppearance="?android:attr/textAppearanceSmall"
@@ -42,7 +42,7 @@
android:layout_marginRight="20dip" />
<SeekBar android:id="@*android:id/seekbar"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="20dip" />
diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index 5905f45..a23e313 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -15,12 +15,12 @@
-->
<ScrollView 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">
<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_horizontal"
android:paddingBottom="20dip">
@@ -31,7 +31,7 @@
android:paddingTop="20dip" />
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/incoming_call_volume_title"
android:paddingTop="20dip"
@@ -40,14 +40,14 @@
<!-- Used for the ring volume. This is what the superclass VolumePreference uses. -->
<SeekBar android:id="@*android:id/seekbar"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="6dip"
android:paddingLeft="20dip"
android:paddingRight="20dip" />
<CheckBox android:id="@+id/same_notification_volume"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/checkbox_notification_same_as_incoming_call"
android:textAppearance="?android:attr/textAppearanceSmall"
@@ -56,7 +56,7 @@
android:layout_marginRight="20dip" />
<TextView android:id="@+id/notification_volume_title"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/notification_volume_title"
android:paddingTop="6dip"
@@ -65,7 +65,7 @@
<!-- Used for the notification volume -->
<SeekBar android:id="@+id/notification_volume_seekbar"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="6dip"
android:paddingLeft="20dip"
diff --git a/res/layout/preference_icon.xml b/res/layout/preference_icon.xml
index 03f4e70..e51a73b 100644
--- a/res/layout/preference_icon.xml
+++ b/res/layout/preference_icon.xml
@@ -19,7 +19,7 @@
type in the "widget_frame" layout. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+android:id/widget_frame"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
diff --git a/res/layout/preference_powergauge.xml b/res/layout/preference_powergauge.xml
index 7aafec1..7de2e20 100644
--- a/res/layout/preference_powergauge.xml
+++ b/res/layout/preference_powergauge.xml
@@ -15,7 +15,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
@@ -63,7 +63,7 @@
android:id="@+id/appGauge"
android:background="#80404040"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_marginTop="5dip"
android:layout_below="@id/percent"
android:layout_gravity="center_vertical" />
diff --git a/res/layout/proxy.xml b/res/layout/proxy.xml
index 914d0ea..3ecbb80 100644
--- a/res/layout/proxy.xml
+++ b/res/layout/proxy.xml
@@ -22,7 +22,7 @@
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:paddingBottom="3dip"
- android:layout_width="fill_parent" android:layout_height="wrap_content">
+ android:layout_width="match_parent" android:layout_height="wrap_content">
<TextView
android:textStyle="bold"
@@ -34,7 +34,7 @@
<EditText android:id="@+id/hostname"
android:maxLines="1"
android:layout_marginTop="2dip"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:autoText="false"
android:capitalize="none"
android:scrollHorizontally="true" />
@@ -50,7 +50,7 @@
android:numeric="integer"
android:maxLines="1"
android:layout_marginTop="2dip"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:scrollHorizontally="true" />
<LinearLayout
@@ -59,17 +59,17 @@
android:layout_width="wrap_content" android:layout_height="wrap_content">
<Button android:id="@+id/action"
- android:layout_width="wrap_content" android:layout_height="fill_parent"
+ android:layout_width="wrap_content" android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/proxy_action_text" />
<Button android:id="@+id/clear"
- android:layout_width="wrap_content" android:layout_height="fill_parent"
+ android:layout_width="wrap_content" android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/proxy_clear_text" />
<Button android:id="@+id/defaultView"
- android:layout_width="wrap_content" android:layout_height="fill_parent"
+ android:layout_width="wrap_content" android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/proxy_defaultView_text" />
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index 1307666..e9841d0 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -18,8 +18,8 @@
*/
-->
<ScrollView 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" >
<LinearLayout style="@style/info_layout">
@@ -177,14 +177,14 @@
<!-- Preferred Network Type -->
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/radio_info_set_perferred_label"
style="@style/info_label"
/>
<Spinner android:id="@+id/preferredNetworkType"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
@@ -197,7 +197,7 @@
/>
<!-- SMSC -->
- <RelativeLayout android:layout_width="fill_parent"
+ <RelativeLayout android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/smsc_label"
android:text="@string/radio_info_smsc_label"
diff --git a/res/layout/remember_dock_setting.xml b/res/layout/remember_dock_setting.xml
index a19ca7c..023a912 100644
--- a/res/layout/remember_dock_setting.xml
+++ b/res/layout/remember_dock_setting.xml
@@ -17,7 +17,7 @@
<CheckBox
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/remember"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/bluetooth_dock_settings_remember"
android:focusable="true"
diff --git a/res/layout/running_services.xml b/res/layout/running_services.xml
index 120a113..2f464a5 100644
--- a/res/layout/running_services.xml
+++ b/res/layout/running_services.xml
@@ -16,27 +16,27 @@
-->
<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">
<FrameLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1">
<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_running_services"
android:textAppearance="?android:attr/textAppearanceLarge" />
</FrameLayout>
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="?android:attr/colorForeground"
diff --git a/res/layout/running_services_item.xml b/res/layout/running_services_item.xml
index 2728c76..f8a0c97 100644
--- a/res/layout/running_services_item.xml
+++ b/res/layout/running_services_item.xml
@@ -18,7 +18,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="vertical"
@@ -30,7 +30,7 @@
android:src="?android:attr/listDivider"/>
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"
@@ -48,12 +48,12 @@
<LinearLayout
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" >
<LinearLayout
android:orientation="horizontal"
android:baselineAlignedChildIndex="0"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/name"
android:layout_width="wrap_content"
diff --git a/res/layout/sdcard_settings_screen.xml b/res/layout/sdcard_settings_screen.xml
index 734a5b6..3fa6c9a 100644
--- a/res/layout/sdcard_settings_screen.xml
+++ b/res/layout/sdcard_settings_screen.xml
@@ -19,19 +19,19 @@
-->
<ScrollView 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">
<LinearLayout android:id="@+id/list"
android:orientation="vertical"
android:padding="10dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout android:id="@+id/usb"
android:orientation="vertical"
android:paddingBottom="10dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<CheckBox android:id="@+id/mass_storage"
@@ -46,12 +46,12 @@
<!-- divider line -->
<View android:background="#FF000000"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="1dip" />
<LinearLayout android:id="@+id/mounted"
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip">
@@ -72,7 +72,7 @@
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TableLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip">
<TableRow>
@@ -105,7 +105,7 @@
<LinearLayout android:id="@+id/shared"
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip">
diff --git a/res/layout/usage_stats.xml b/res/layout/usage_stats.xml
index 727052d..9ce338c 100755
--- a/res/layout/usage_stats.xml
+++ b/res/layout/usage_stats.xml
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
<TextView
android:text="@string/display_order_text"
android:textAppearance="?android:attr/textAppearanceLarge"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Spinner
android:id="@+id/typeSpinner"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:entries="@array/usage_stats_display_order_types" />
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView
android:text="@string/app_name_label"
@@ -39,7 +39,7 @@
android:layout_height="wrap_content" />
</LinearLayout>
<ListView android:id="@+id/pkg_list"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:drawSelectorOnTop="false" />
</LinearLayout>
diff --git a/res/layout/usage_stats_item.xml b/res/layout/usage_stats_item.xml
index 7ab0090..bdadf85 100755
--- a/res/layout/usage_stats_item.xml
+++ b/res/layout/usage_stats_item.xml
@@ -18,7 +18,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:minHeight="?android:attr/listPreferredItemHeight">
diff --git a/res/layout/vpn_connect_dialog_view.xml b/res/layout/vpn_connect_dialog_view.xml
index 062f881..3b6d0db 100644
--- a/res/layout/vpn_connect_dialog_view.xml
+++ b/res/layout/vpn_connect_dialog_view.xml
@@ -15,18 +15,18 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<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"
android:padding="10dip">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/username_str"
android:layout_width="@dimen/vpn_connect_input_box_label_width"
@@ -36,14 +36,14 @@
android:layout_marginRight="@dimen/vpn_connect_margin_right"
android:text="@string/vpn_username_colon" />
<EditText android:id="@+id/username_value"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="True"/>
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/password_str"
android:layout_width="@dimen/vpn_connect_input_box_label_width"
@@ -53,14 +53,14 @@
android:layout_marginRight="@dimen/vpn_connect_margin_right"
android:text="@string/vpn_password_colon" />
<EditText android:id="@+id/password_value"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:password="True"
android:singleLine="True"/>
</LinearLayout>
<CheckBox android:id="@+id/save_username"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="66dip"
android:text="@string/vpn_save_username" />
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index 1e22dbe..210fcc1 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -16,8 +16,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:gravity="center"
android:background="@drawable/appwidget_bg" >
@@ -25,7 +25,7 @@
android:id="@+id/btn_wifi"
android:layout_width="0dip"
android:layout_weight="1"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:background="@drawable/appwidget_button_left"
android:clickable="true"
android:focusable="true"
@@ -33,7 +33,7 @@
<ImageView
android:id="@+id/img_wifi"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:scaleType="center"
@@ -41,7 +41,7 @@
<ImageView
android:id="@+id/ind_wifi"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
/>
@@ -49,7 +49,7 @@
<ImageView
android:layout_width="1dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:background="@drawable/appwidget_settings_divider"
/>
@@ -57,7 +57,7 @@
android:id="@+id/btn_bluetooth"
android:layout_width="0dip"
android:layout_weight="1"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:background="@drawable/appwidget_button_center"
android:clickable="true"
android:focusable="true"
@@ -65,7 +65,7 @@
<ImageView
android:id="@+id/img_bluetooth"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:scaleType="center"
@@ -73,7 +73,7 @@
<ImageView
android:id="@+id/ind_bluetooth"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
/>
@@ -82,7 +82,7 @@
<ImageView
android:layout_width="1dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:background="@drawable/appwidget_settings_divider"
/>
@@ -90,7 +90,7 @@
android:id="@+id/btn_gps"
android:layout_width="0dip"
android:layout_weight="1"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:background="@drawable/appwidget_button_center"
android:clickable="true"
android:focusable="true"
@@ -98,7 +98,7 @@
<ImageView
android:id="@+id/img_gps"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:scaleType="center"
@@ -106,7 +106,7 @@
<ImageView
android:id="@+id/ind_gps"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
/>
@@ -114,7 +114,7 @@
<ImageView
android:layout_width="1dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:background="@drawable/appwidget_settings_divider"
/>
@@ -122,7 +122,7 @@
android:id="@+id/btn_sync"
android:layout_width="0dip"
android:layout_weight="1"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:background="@drawable/appwidget_button_center"
android:clickable="true"
android:focusable="true"
@@ -130,7 +130,7 @@
<ImageView
android:id="@+id/img_sync"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:scaleType="center"
@@ -138,7 +138,7 @@
<ImageView
android:id="@+id/ind_sync"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
/>
@@ -146,7 +146,7 @@
<ImageView
android:layout_width="1dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:background="@drawable/appwidget_settings_divider"
/>
@@ -154,7 +154,7 @@
android:id="@+id/btn_brightness"
android:layout_width="0dip"
android:layout_weight="1"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:background="@drawable/appwidget_button_right"
android:clickable="true"
android:focusable="true"
@@ -162,7 +162,7 @@
<ImageView
android:id="@+id/img_brightness"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:scaleType="center"
@@ -170,7 +170,7 @@
<ImageView
android:id="@+id/ind_brightness"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
/>
diff --git a/res/layout/wifi_ap_configure.xml b/res/layout/wifi_ap_configure.xml
index f816ae5..3f8fbba 100644
--- a/res/layout/wifi_ap_configure.xml
+++ b/res/layout/wifi_ap_configure.xml
@@ -15,19 +15,19 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dip"
android:orientation="vertical">
<LinearLayout
android:id="@+id/table"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout>
@@ -36,12 +36,12 @@
<TextView android:id="@+id/ssid_text"
style="?android:attr/textAppearanceSmallInverse"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/wifi_type_ssid" />
<EditText android:id="@+id/ssid_edit"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:singleLine="true"
@@ -51,79 +51,79 @@
<TextView android:id="@+id/security_text"
style="?android:attr/textAppearanceSmallInverse"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/wifi_security" />
<!-- The entries will be set programmatically -->
<Spinner android:id="@+id/security_spinner"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!-- Enterprise Fields -->
<LinearLayout android:id="@+id/enterprise_wrapper"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dip"
android:orientation="vertical">
<TextView android:id="@+id/eap_text"
style="?android:attr/textAppearanceSmallInverse"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_select_eap" />
<Spinner android:id="@+id/eap_spinner"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView android:id="@+id/phase2_text"
style="?android:attr/textAppearanceSmallInverse"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_select_phase2" />
<Spinner android:id="@+id/phase2_spinner"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView android:id="@+id/ca_certificate_text"
style="?android:attr/textAppearanceSmallInverse"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_select_ca_certificate" />
<Spinner android:id="@+id/ca_certificate_spinner"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView android:id="@+id/client_certificate_text"
style="?android:attr/textAppearanceSmallInverse"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_select_client_certificate" />
<Spinner android:id="@+id/client_certificate_spinner"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView android:id="@+id/identity_text"
style="?android:attr/textAppearanceSmallInverse"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_type_identity" />
<EditText android:id="@+id/identity_edit"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:singleLine="true"
android:inputType="textNoSuggestions" />
<TextView android:id="@+id/anonymous_identity_text"
style="?android:attr/textAppearanceSmallInverse"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_type_anonymous_identity" />
<EditText android:id="@+id/anonymous_identity_edit"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:singleLine="true" />
@@ -133,13 +133,13 @@
<TextView android:id="@+id/password_text"
style="?android:attr/textAppearanceSmallInverse"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_type_passphrase" />
<EditText android:id="@+id/password_edit"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:singleLine="true"
@@ -147,13 +147,13 @@
<CheckBox android:id="@+id/show_password_checkbox"
style="?android:attr/textAppearanceSmallInverse"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:text="@string/wifi_show_password" />
<Spinner android:id="@+id/wep_type_spinner"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:entries="@array/wifi_wep_type" />
diff --git a/res/layout/wifi_ap_info.xml b/res/layout/wifi_ap_info.xml
index 8c430fc..d38a831 100644
--- a/res/layout/wifi_ap_info.xml
+++ b/res/layout/wifi_ap_info.xml
@@ -15,19 +15,19 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dip"
android:orientation="vertical">
<LinearLayout
android:id="@+id/table"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical">
<!-- Info dynamically added here. -->
@@ -37,13 +37,13 @@
<!-- Password -->
<TextView android:id="@+id/password_text"
style="?android:attr/textAppearanceSmallInverse"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_type_passphrase" />
<EditText android:id="@+id/password_edit"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:singleLine="true"
@@ -51,7 +51,7 @@
<CheckBox android:id="@+id/show_password_checkbox"
style="?android:attr/textAppearanceSmallInverse"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:text="@string/wifi_show_password" />
diff --git a/res/layout/wifi_ap_info_row.xml b/res/layout/wifi_ap_info_row.xml
index 79064b0..dfc4ca8 100644
--- a/res/layout/wifi_ap_info_row.xml
+++ b/res/layout/wifi_ap_info_row.xml
@@ -15,7 +15,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/name"
diff --git a/res/layout/wifi_ap_retry_password.xml b/res/layout/wifi_ap_retry_password.xml
index 14a4eae..d460d8e 100644
--- a/res/layout/wifi_ap_retry_password.xml
+++ b/res/layout/wifi_ap_retry_password.xml
@@ -15,31 +15,31 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dip"
android:orientation="vertical">
<TextView
style="?android:attr/textAppearanceSmallInverse"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/wifi_password_incorrect_error" />
<!-- Password -->
<TextView android:id="@+id/password_text"
style="?android:attr/textAppearanceSmallInverse"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_type_passphrase" />
<EditText android:id="@+id/password_edit"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:singleLine="true"
@@ -47,7 +47,7 @@
<CheckBox android:id="@+id/show_password_checkbox"
style="?android:attr/textAppearanceSmallInverse"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:text="@string/wifi_show_password" />
diff --git a/res/layout/wifi_config_info.xml b/res/layout/wifi_config_info.xml
index 0aeff6e..c95eb6a 100644
--- a/res/layout/wifi_config_info.xml
+++ b/res/layout/wifi_config_info.xml
@@ -14,8 +14,8 @@
limitations under the License.
-->
<ScrollView 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" >
<LinearLayout style="@style/info_layout">
diff --git a/res/layout/wifi_status_test.xml b/res/layout/wifi_status_test.xml
index 5b8ec5d..2bdfbfc 100644
--- a/res/layout/wifi_status_test.xml
+++ b/res/layout/wifi_status_test.xml
@@ -14,8 +14,8 @@
limitations under the License.
-->
<ScrollView 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" >
<LinearLayout style="@style/info_layout">
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 33e43bb..7c77f49 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -44,8 +44,8 @@
<item name="android:paddingTop">10dip</item>
<item name="android:paddingRight">10dip</item>
<item name="android:paddingBottom">10dip</item>
- <item name="android:layout_width">fill_parent</item>
- <item name="android:layout_height">fill_parent</item>
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">match_parent</item>
</style>
<style name="entry_layout">
@@ -56,7 +56,7 @@
<style name="form_value">
<item name="android:layout_height">wrap_content</item>
- <item name="android:layout_width">fill_parent</item>
+ <item name="android:layout_width">match_parent</item>
</style>
diff --git a/src/com/android/settings/BandMode.java b/src/com/android/settings/BandMode.java
index a8c7833..4c7663e 100644
--- a/src/com/android/settings/BandMode.java
+++ b/src/com/android/settings/BandMode.java
@@ -62,7 +62,7 @@
setContentView(R.layout.band_mode);
setTitle(getString(R.string.band_mode_title));
- getWindow().setLayout(WindowManager.LayoutParams.FILL_PARENT,
+ getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT,
WindowManager.LayoutParams.WRAP_CONTENT);
mPhone = PhoneFactory.getDefaultPhone();
diff --git a/tests/res/layout/bluetooth_request_permission_test.xml b/tests/res/layout/bluetooth_request_permission_test.xml
index 8bb0daa..4d54544 100644
--- a/tests/res/layout/bluetooth_request_permission_test.xml
+++ b/tests/res/layout/bluetooth_request_permission_test.xml
@@ -16,18 +16,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">
<ListView android:id="@+id/msg_container"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:transcriptMode="normal"/>
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@android:style/ButtonBar">