Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
diff --git a/apps/CustomLocale/res/layout/list_item.xml b/apps/CustomLocale/res/layout/list_item.xml
index 8c59f92..0ffb8b0 100644
--- a/apps/CustomLocale/res/layout/list_item.xml
+++ b/apps/CustomLocale/res/layout/list_item.xml
@@ -15,12 +15,12 @@
-->
<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="5dip">
<TextView
android:id="@+id/locale_code"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:textAppearanceLarge"
android:layout_weight="1"
@@ -28,7 +28,7 @@
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/locale_name"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:textAppearance"
android:layout_weight="1" />
diff --git a/apps/CustomLocale/res/layout/main.xml b/apps/CustomLocale/res/layout/main.xml
index b1eaa51..55bd90c 100644
--- a/apps/CustomLocale/res/layout/main.xml
+++ b/apps/CustomLocale/res/layout/main.xml
@@ -16,10 +16,10 @@
<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="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:text="@string/header_current_locale"
@@ -28,12 +28,12 @@
android:background="@color/header_background" />
<TextView
android:id="@+id/current_locale"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:padding="5dip" />
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:text="@string/header_locale_list"
@@ -42,18 +42,18 @@
android:background="@color/header_background" />
<ListView
android:id="@id/android: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:padding="8dip" />
<TextView
android:id="@id/android:empty"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:text="@string/no_data_label" />
<Button
android:id="@+id/new_locale"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingLeft="8dip"
diff --git a/apps/CustomLocale/res/layout/new_locale.xml b/apps/CustomLocale/res/layout/new_locale.xml
index fafb16e..e5be408 100644
--- a/apps/CustomLocale/res/layout/new_locale.xml
+++ b/apps/CustomLocale/res/layout/new_locale.xml
@@ -16,32 +16,32 @@
<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:paddingLeft="8dip"
android:paddingRight="8dip">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/new_locale_label" />
<EditText
android:id="@+id/value"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/locale_default" android:inputType="text"/>
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
android:id="@+id/add"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/add_button" android:layout_gravity="center_vertical"/>
<Button
android:id="@+id/add_and_select"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/add_select_button" android:layout_gravity="center_vertical"/>
diff --git a/apps/Development/res/layout/account_list_view.xml b/apps/Development/res/layout/account_list_view.xml
index d255672..47484ed 100644
--- a/apps/Development/res/layout/account_list_view.xml
+++ b/apps/Development/res/layout/account_list_view.xml
@@ -16,5 +16,5 @@
<ListView
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"/>
diff --git a/apps/Development/res/layout/accounts_tester.xml b/apps/Development/res/layout/accounts_tester.xml
index e69f505..e3dee53 100644
--- a/apps/Development/res/layout/accounts_tester.xml
+++ b/apps/Development/res/layout/accounts_tester.xml
@@ -17,20 +17,20 @@
<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">
<LinearLayout
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<ListView android:id="@+id/accounts_tester_authenticators_list"
- android:layout_width="fill_parent" android:layout_height="fill_parent"/>
+ android:layout_width="match_parent" android:layout_height="match_parent"/>
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/accounts_tester_account_types_spinner_label"
@@ -45,11 +45,11 @@
<LinearLayout
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">
<Button
android:id="@+id/accounts_tester_get_accounts_by_type"
@@ -75,7 +75,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/accounts_tester_desiredFeatures"
android:layout_width="wrap_content"
@@ -89,7 +89,7 @@
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/accounts_tester_desiredFeatures"
android:layout_width="wrap_content"
@@ -106,11 +106,11 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<ListView android:id="@+id/accounts_tester_accounts_list"
- android:layout_width="fill_parent" android:layout_height="fill_parent"/>
+ android:layout_width="match_parent" android:layout_height="match_parent"/>
</LinearLayout>
diff --git a/apps/Development/res/layout/application_hw_pref.xml b/apps/Development/res/layout/application_hw_pref.xml
index c38a0cb..c0011e5 100755
--- a/apps/Development/res/layout/application_hw_pref.xml
+++ b/apps/Development/res/layout/application_hw_pref.xml
@@ -15,75 +15,75 @@
-->
<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:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:padding="4dip" >
<TextView android:id="@+id/attr_package_label"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/package_label"
android:textStyle="bold" />
<TextView android:id="@+id/attr_package"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView android:id="@+id/attr_touchscreen_label"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/touchscreen_label"
android:textStyle="bold" />
<TextView android:id="@+id/attr_touchscreen"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView android:id="@+id/attr_input_method_label"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/input_method_label"
android:textStyle="bold" />
<TextView android:id="@+id/attr_input_method"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView android:id="@+id/attr_hard_keyboard_label"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/hard_keyboard_label"
android:textStyle="bold" />
<TextView android:id="@+id/attr_hard_keyboard"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView android:id="@+id/attr_navigation_label"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/navigation_label"
android:textStyle="bold" />
<TextView android:id="@+id/attr_navigation"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView android:id="@+id/attr_five_way_nav_label"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/five_way_nav_label"
android:textStyle="bold" />
<TextView android:id="@+id/attr_five_way_nav"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView android:id="@+id/attr_gles_version_label"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/gles_version_label"
android:textStyle="bold" />
<TextView android:id="@+id/attr_gles_version"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
</ScrollView>
diff --git a/apps/Development/res/layout/authenticators_list_item.xml b/apps/Development/res/layout/authenticators_list_item.xml
index 309a818..25e1dae 100644
--- a/apps/Development/res/layout/authenticators_list_item.xml
+++ b/apps/Development/res/layout/authenticators_list_item.xml
@@ -19,7 +19,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:paddingTop="1dip"
@@ -35,7 +35,7 @@
<TextView android:id="@+id/accounts_tester_authenticator_label"
android:layout_width="wrap_content"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_gravity="center_horizontal|center_vertical" />
diff --git a/apps/Development/res/layout/bad_behavior.xml b/apps/Development/res/layout/bad_behavior.xml
index 72275ae..e7477ec 100644
--- a/apps/Development/res/layout/bad_behavior.xml
+++ b/apps/Development/res/layout/bad_behavior.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">
<Button android:id="@+id/bad_behavior_crash_system"
android:layout_width="wrap_content"
diff --git a/apps/Development/res/layout/connectivity.xml b/apps/Development/res/layout/connectivity.xml
index b603496..612304f 100644
--- a/apps/Development/res/layout/connectivity.xml
+++ b/apps/Development/res/layout/connectivity.xml
@@ -20,12 +20,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">
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/enableWifi"
android:layout_width="wrap_content"
@@ -39,13 +39,13 @@
<!-- divider line -->
<View android:background="#FFFFFFFF"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="3dip" />
<LinearLayout
android:orientation="horizontal"
android:paddingTop="4dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/startDelayedCycle"
android:layout_width="wrap_content"
@@ -59,7 +59,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
@@ -73,7 +73,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
@@ -87,7 +87,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
@@ -101,13 +101,13 @@
<!-- divider line -->
<View android:background="#FFFFFFFF"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="3dip" />
<LinearLayout
android:orientation="horizontal"
android:paddingTop="4dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/startScreenCycle"
android:layout_width="wrap_content"
@@ -121,7 +121,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
@@ -135,7 +135,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
@@ -149,7 +149,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
@@ -163,13 +163,13 @@
<!-- divider line -->
<View android:background="#FFFFFFFF"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="3dip" />
<LinearLayout
android:orientation="horizontal"
android:paddingTop="4dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/start_mms"
android:layout_width="wrap_content"
@@ -182,7 +182,7 @@
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/start_hipri"
android:layout_width="wrap_content"
@@ -195,7 +195,7 @@
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/crash"
android:layout_width="wrap_content"
diff --git a/apps/Development/res/layout/development_settings.xml b/apps/Development/res/layout/development_settings.xml
index 7bad3bb..9c04f5d 100644
--- a/apps/Development/res/layout/development_settings.xml
+++ b/apps/Development/res/layout/development_settings.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">
<RelativeLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<TextView android:id="@+id/debug_app_label"
android:layout_width="wrap_content"
@@ -76,7 +76,7 @@
android:text="@string/development_settings_compatibility_mode_text" />
<Spinner android:id="@+id/max_procs"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/compatibility_mode"
android:layout_alignParentLeft="true" />
@@ -123,21 +123,21 @@
android:text="@string/development_settings_show_sleep_text" />
<Spinner android:id="@+id/window_animation_scale"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/show_sleep"
android:layout_alignParentLeft="true">
</Spinner>
<Spinner android:id="@+id/transition_animation_scale"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/window_animation_scale"
android:layout_alignParentLeft="true">
</Spinner>
<Spinner android:id="@+id/font_hinting"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/transition_animation_scale"
android:layout_alignParentLeft="true">
diff --git a/apps/Development/res/layout/enter_url.xml b/apps/Development/res/layout/enter_url.xml
index 062c67e..5868006 100644
--- a/apps/Development/res/layout/enter_url.xml
+++ b/apps/Development/res/layout/enter_url.xml
@@ -15,19 +15,19 @@
-->
<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">
<com.android.development.UrlEditText android:id="@+id/url_edit_text"
android:textSize="13sp"
android:autoText="false"
android:capitalize="none"
- android:layout_width="fill_parent" android:layout_height="wrap_content"/>
+ android:layout_width="match_parent" android:layout_height="wrap_content"/>
<com.android.development.DisplayEditText android:id="@+id/display_edit_text"
android:textSize="13sp"
android:autoText="false"
android:capitalize="none"
- android:layout_width="fill_parent" android:layout_height="wrap_content"/>
+ 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"/>
</LinearLayout>
diff --git a/apps/Development/res/layout/get_auth_token_view.xml b/apps/Development/res/layout/get_auth_token_view.xml
index f371523..c014cad 100644
--- a/apps/Development/res/layout/get_auth_token_view.xml
+++ b/apps/Development/res/layout/get_auth_token_view.xml
@@ -17,16 +17,16 @@
<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:id="@+id/accounts_tester_get_auth_token_dialog_message"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/accounts_tester_enter_auth_token_type" />
<EditText android:id="@+id/accounts_tester_auth_token_type"
android:singleLine="true"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minWidth="250dip"
android:scrollHorizontally="true"
diff --git a/apps/Development/res/layout/log_viewer.xml b/apps/Development/res/layout/log_viewer.xml
index 98fe14e..7075d5f 100644
--- a/apps/Development/res/layout/log_viewer.xml
+++ b/apps/Development/res/layout/log_viewer.xml
@@ -15,6 +15,6 @@
-->
<com.android.development.LogTextBox xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
/>
diff --git a/apps/Development/res/layout/media_scanner_activity.xml b/apps/Development/res/layout/media_scanner_activity.xml
index 53f2b15..974f683 100644
--- a/apps/Development/res/layout/media_scanner_activity.xml
+++ b/apps/Development/res/layout/media_scanner_activity.xml
@@ -15,11 +15,11 @@
-->
<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">
<TextView android:id="@+id/title" android:textSize="16sp" android:textStyle="bold"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
</LinearLayout>
diff --git a/apps/Development/res/layout/monkey_screen.xml b/apps/Development/res/layout/monkey_screen.xml
index c508338..fc4a9d0 100644
--- a/apps/Development/res/layout/monkey_screen.xml
+++ b/apps/Development/res/layout/monkey_screen.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">
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip" >
@@ -32,14 +32,14 @@
android:text="@string/monkey_screen_initial_activity_label" />
<Button android:id="@+id/initialActivity"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/monkey_screen_initialActivity_text" />
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="5dip" >
@@ -51,7 +51,7 @@
<EditText android:id="@+id/numberOfEvents"
android:layout_marginLeft="2dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:drawable/editbox_background"
android:numeric="integer"
diff --git a/apps/Development/res/layout/package_item.xml b/apps/Development/res/layout/package_item.xml
index 7860f9b..5a26496 100644
--- a/apps/Development/res/layout/package_item.xml
+++ b/apps/Development/res/layout/package_item.xml
@@ -15,6 +15,6 @@
-->
<Button 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:background="@android:drawable/list_highlight"-->
diff --git a/apps/Development/res/layout/package_list_item.xml b/apps/Development/res/layout/package_list_item.xml
index 6a0faee..3041bcc 100644
--- a/apps/Development/res/layout/package_list_item.xml
+++ b/apps/Development/res/layout/package_list_item.xml
@@ -18,14 +18,14 @@
-->
<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"
android:gravity="fill" >
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"
@@ -43,7 +43,7 @@
<LinearLayout
android:orientation="vertical"
- 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/apps/Development/res/layout/package_summary.xml b/apps/Development/res/layout/package_summary.xml
index 99717e6..e02ab3c 100644
--- a/apps/Development/res/layout/package_summary.xml
+++ b/apps/Development/res/layout/package_summary.xml
@@ -15,21 +15,21 @@
-->
<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:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:padding="4dip" >
<TextView android:id="@+id/packageView"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" />
<LinearLayout
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="4dip"
android:paddingBottom="6dip"
@@ -44,29 +44,29 @@
android:orientation="vertical">
<TextView android:id="@+id/classView"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView android:id="@+id/label"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView android:id="@+id/disabled"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/disabled" />
<TextView android:id="@+id/system"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/system" />
<TextView android:id="@+id/debuggable"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/debuggable" />
<TextView android:id="@+id/nocode"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/nocode" />
<TextView android:id="@+id/persistent"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/persistent" />
</LinearLayout>
@@ -80,46 +80,46 @@
</LinearLayout>
<TextView style="@style/SummaryCategoryLayout"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/package_summary_process_label" />
<TextView android:id="@+id/process"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/package_summary_uid_label" />
<TextView android:id="@+id/uid"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/package_summary_task_label" />
<TextView android:id="@+id/task"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/package_summary_version_label" />
<TextView android:id="@+id/version"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/package_summary_source_label" />
<TextView android:id="@+id/source"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/package_summary_data_label" />
<TextView android:id="@+id/data"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
<LinearLayout android:id="@+id/activities" style="@style/SummaryCategoryLayout">
<TextView style="@style/SummaryCategoryHeader"
diff --git a/apps/Development/res/layout/permission_details.xml b/apps/Development/res/layout/permission_details.xml
index d6635f8..b19ee0b 100755
--- a/apps/Development/res/layout/permission_details.xml
+++ b/apps/Development/res/layout/permission_details.xml
@@ -16,16 +16,16 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:fillViewport="true"
- 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"
android:padding="4dip" >
<LinearLayout android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="4dip" >
<TextView android:id="@+id/perm_name_label"
@@ -39,7 +39,7 @@
</LinearLayout>
<LinearLayout android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="4dip" >
<TextView android:id="@+id/perm_desc_label"
@@ -53,7 +53,7 @@
</LinearLayout>
<LinearLayout android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="4dip" >
<TextView android:id="@+id/perm_group_label"
@@ -67,7 +67,7 @@
</LinearLayout>
<LinearLayout android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="4dip" >
<TextView android:id="@+id/perm_protection_label"
@@ -81,7 +81,7 @@
</LinearLayout>
<LinearLayout android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="4dip" >
<TextView android:id="@+id/perm_source_label"
@@ -95,7 +95,7 @@
</LinearLayout>
<LinearLayout android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="4dip" >
<TextView android:id="@+id/source_uid_label"
@@ -109,7 +109,7 @@
</LinearLayout>
<LinearLayout android:id="@+id/shared_pkgs_panel"
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="4dip" >
<TextView android:id="@+id/shared_pkgs_label"
@@ -128,7 +128,7 @@
android:text="@string/perm_list_header_text"
android:textStyle="bold" />
<ListView android:id="@android:id/list"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
</ScrollView>
diff --git a/apps/Development/res/layout/pkg_list_item.xml b/apps/Development/res/layout/pkg_list_item.xml
index 29de423..585e2f1 100755
--- a/apps/Development/res/layout/pkg_list_item.xml
+++ b/apps/Development/res/layout/pkg_list_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"
diff --git a/apps/Development/res/layout/process_info.xml b/apps/Development/res/layout/process_info.xml
index b25f223..311e81b 100755
--- a/apps/Development/res/layout/process_info.xml
+++ b/apps/Development/res/layout/process_info.xml
@@ -15,31 +15,31 @@
-->
<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:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:padding="4dip" >
<TextView android:id="@+id/process_name_header"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/process_name_header"
android:textStyle="bold" />
<TextView android:id="@+id/process_name"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView android:id="@+id/package_list_header"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/package_list_header"
android:textStyle="bold" />
<LinearLayout android:id="@+id/package_list"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="4dip"
diff --git a/apps/Development/res/layout/show_activity.xml b/apps/Development/res/layout/show_activity.xml
index 6a7617c..c09ac45 100644
--- a/apps/Development/res/layout/show_activity.xml
+++ b/apps/Development/res/layout/show_activity.xml
@@ -19,20 +19,20 @@
-->
<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:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_width="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="8dip" android:paddingLeft="2dip" android:paddingRight="2dip" >
<TextView android:id="@+id/packageView"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" />
<LinearLayout
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="4dip"
android:paddingBottom="6dip" >
@@ -42,63 +42,63 @@
android:paddingRight="8dip" />
<LinearLayout
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:orientation="vertical">
<TextView android:id="@+id/classView"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView android:id="@+id/label"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView android:id="@+id/launch"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
<TextView style="@style/SummaryCategoryLayout"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/show_activity_process_label" />
<TextView android:id="@+id/process"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/show_activity_task_affinity_label" />
<TextView android:id="@+id/taskAffinity"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/show_activity_required_permission_label" />
<TextView android:id="@+id/permission"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/show_activity_multiprocess_label" />
<TextView android:id="@+id/multiprocess"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/show_activity_clear_on_background_label" />
<TextView android:id="@+id/clearOnBackground"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
<TextView style="@style/SummaryCategoryLayout"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/show_activity_state_not_needed_label" />
<TextView android:id="@+id/stateNotNeeded"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
+ android:layout_width="match_parent" android:layout_height="wrap_content" />
</LinearLayout>
diff --git a/apps/Development/res/layout/sync_adapter_driver.xml b/apps/Development/res/layout/sync_adapter_driver.xml
index 58c0ebb..9e99e99 100644
--- a/apps/Development/res/layout/sync_adapter_driver.xml
+++ b/apps/Development/res/layout/sync_adapter_driver.xml
@@ -17,11 +17,11 @@
<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">
<LinearLayout android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/sync_adapters_spinner_label"
android:layout_width="wrap_content"
@@ -34,7 +34,7 @@
android:layout_height="wrap_content"/>
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="52dip">
<Button
android:id="@+id/bind_button"
@@ -60,7 +60,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="52dip">
<Button
android:id="@+id/start_sync_button"
diff --git a/apps/Development/res/layout/sync_adapter_item.xml b/apps/Development/res/layout/sync_adapter_item.xml
index d818c78..15a25e0 100644
--- a/apps/Development/res/layout/sync_adapter_item.xml
+++ b/apps/Development/res/layout/sync_adapter_item.xml
@@ -21,6 +21,6 @@
android:id="@android:id/text1"
style="?android:attr/spinnerItemStyle"
android:singleLine="true"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="52dip"
android:ellipsize="marquee" />
diff --git a/apps/Development/res/layout/url_list.xml b/apps/Development/res/layout/url_list.xml
index f004eff..5364d61 100644
--- a/apps/Development/res/layout/url_list.xml
+++ b/apps/Development/res/layout/url_list.xml
@@ -15,7 +15,7 @@
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#FF000000"
android:textSize="13sp"
diff --git a/apps/Development/res/values/styles.xml b/apps/Development/res/values/styles.xml
index 591eed8..0af882c 100644
--- a/apps/Development/res/values/styles.xml
+++ b/apps/Development/res/values/styles.xml
@@ -16,7 +16,7 @@
<resources>
<style name="SummaryCategoryLayout">
- <item name="android:layout_width">fill_parent</item>
+ <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:orientation">vertical</item>
</style>
@@ -34,8 +34,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">
<item name="android:orientation">horizontal</item>
diff --git a/apps/Development/src/com/android/development/Details.java b/apps/Development/src/com/android/development/Details.java
index 16722a3..e0da961 100644
--- a/apps/Development/src/com/android/development/Details.java
+++ b/apps/Development/src/com/android/development/Details.java
@@ -27,7 +27,6 @@
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
-import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
@@ -75,8 +74,8 @@
}
mLinearLayout = new LinearLayout(this);
mScrollView.addView(mLinearLayout, new ViewGroup.LayoutParams(
- ViewGroup.LayoutParams.FILL_PARENT,
- ViewGroup.LayoutParams.FILL_PARENT));
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT));
mLinearLayout.setOrientation(LinearLayout.VERTICAL);
// Here in onStart, we're given data. We use that because some
@@ -109,7 +108,7 @@
LinearLayout.LayoutParams lazy()
{
- return new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
+ return new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT, 0);
}
diff --git a/apps/FontLab/res/layout/font_lab.xml b/apps/FontLab/res/layout/font_lab.xml
index 1a79add..ff9db31 100644
--- a/apps/FontLab/res/layout/font_lab.xml
+++ b/apps/FontLab/res/layout/font_lab.xml
@@ -16,14 +16,14 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/content"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_width="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="4dip" android:paddingRight="4dip"
android:paddingTop="4dip" android:paddingBottom="4dip">
- <TextView android:id="@+id/column1" android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1"
+ <TextView android:id="@+id/column1" android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1"
android:layout_marginBottom="8dip" />
- <TextView android:id="@+id/column2" android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1" />
+ <TextView android:id="@+id/column2" android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" />
</LinearLayout>
diff --git a/apps/GestureBuilder/res/layout/create_gesture.xml b/apps/GestureBuilder/res/layout/create_gesture.xml
index ad58ab3..89e64c6 100644
--- a/apps/GestureBuilder/res/layout/create_gesture.xml
+++ b/apps/GestureBuilder/res/layout/create_gesture.xml
@@ -17,13 +17,13 @@
<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="wrap_content"
android:orientation="horizontal">
@@ -49,7 +49,7 @@
<android.gesture.GestureOverlayView
android:id="@+id/gestures_overlay"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1.0"
@@ -58,7 +58,7 @@
<LinearLayout
style="@android:style/ButtonBar"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
diff --git a/apps/GestureBuilder/res/layout/dialog_rename.xml b/apps/GestureBuilder/res/layout/dialog_rename.xml
index 4968944..49df806 100644
--- a/apps/GestureBuilder/res/layout/dialog_rename.xml
+++ b/apps/GestureBuilder/res/layout/dialog_rename.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:padding="20dip"
android:orientation="vertical">
@@ -31,7 +31,7 @@
<EditText
android:id="@+id/name"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:scrollHorizontally="true"
android:autoText="false"
android:capitalize="none"
diff --git a/apps/GestureBuilder/res/layout/gestures_item.xml b/apps/GestureBuilder/res/layout/gestures_item.xml
index 1563dfe..36c93b8 100644
--- a/apps/GestureBuilder/res/layout/gestures_item.xml
+++ b/apps/GestureBuilder/res/layout/gestures_item.xml
@@ -16,7 +16,7 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
diff --git a/apps/GestureBuilder/res/layout/gestures_list.xml b/apps/GestureBuilder/res/layout/gestures_list.xml
index 7e5b94a..d0b5e3d 100644
--- a/apps/GestureBuilder/res/layout/gestures_list.xml
+++ b/apps/GestureBuilder/res/layout/gestures_list.xml
@@ -16,21 +16,21 @@
<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">
<ListView
android:id="@android:id/list"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1.0" />
<TextView
android:id="@android:id/empty"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1.0"
@@ -42,7 +42,7 @@
<LinearLayout
style="@android:style/ButtonBar"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
diff --git a/apps/GraphicsLab/res/layout/graphics_lab.xml b/apps/GraphicsLab/res/layout/graphics_lab.xml
index 5077831..7c0e5d9 100644
--- a/apps/GraphicsLab/res/layout/graphics_lab.xml
+++ b/apps/GraphicsLab/res/layout/graphics_lab.xml
@@ -16,7 +16,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/content"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_width="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="4dip" android:paddingRight="4dip"
android:paddingTop="4dip" android:paddingBottom="4dip">
diff --git a/apps/SpareParts/res/layout/spare_parts.xml b/apps/SpareParts/res/layout/spare_parts.xml
index f39298b..6ef40d2 100644
--- a/apps/SpareParts/res/layout/spare_parts.xml
+++ b/apps/SpareParts/res/layout/spare_parts.xml
@@ -18,21 +18,21 @@
*/
-->
<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">
<RelativeLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<Spinner android:id="@+id/window_animation_scale"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true">
</Spinner>
<Spinner android:id="@+id/transition_animation_scale"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/window_animation_scale"
android:layout_alignParentLeft="true">
diff --git a/apps/Term/res/layout/term_activity.xml b/apps/Term/res/layout/term_activity.xml
index 7d93d16..6ce7719 100644
--- a/apps/Term/res/layout/term_activity.xml
+++ b/apps/Term/res/layout/term_activity.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="vertical">
<com.android.term.EmulatorView android:id="@+id/emulatorView"
diff --git a/apps/launchperf/res/layout/complex_layout.xml b/apps/launchperf/res/layout/complex_layout.xml
index 4e585b9..291b2fe 100644
--- a/apps/launchperf/res/layout/complex_layout.xml
+++ b/apps/launchperf/res/layout/complex_layout.xml
@@ -23,36 +23,36 @@
-->
<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">
<!-- <TabHost
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="200dip">
</TabHost>
<GridView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="200dip"
android:numColumns="5">
</GridView> -->
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="200dip"
android:orientation="vertical">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/header_absolute"/>
<AbsoluteLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_x="0dip"
android:layout_y="0dip"
@@ -175,12 +175,12 @@
</AbsoluteLayout>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/header_relative"/>
<RelativeLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/relative_button1"
@@ -238,17 +238,17 @@
</RelativeLayout>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/header_linear"/>
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
@@ -272,11 +272,11 @@
</LinearLayout>
<EditText
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/blue"
android:text="@string/test_long_paragraph"/>
diff --git a/apps/launchperf/res/layout/simple_layout.xml b/apps/launchperf/res/layout/simple_layout.xml
index 3a61724..46244ff 100644
--- a/apps/launchperf/res/layout/simple_layout.xml
+++ b/apps/launchperf/res/layout/simple_layout.xml
@@ -26,28 +26,28 @@
a row, here set to be vertical (so the first is at the top) -->
<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">
<RelativeLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<RelativeLayout android:id="@+id/replay_pane"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="True"
android:background="@color/replay_background">
<TextView android:id="@+id/instructions"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/response" />
<EditText android:id="@+id/entry"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="44dip"
android:layout_below="@id/instructions"/>
@@ -68,13 +68,13 @@
</RelativeLayout>
<ScrollView android:id="@+id/scroll_pane"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:layout_above="@id/replay_pane">
<TextView android:id="@+id/text_field"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:text="@string/text"/>
<requestFocus/>
diff --git a/ndk/apps/san-angeles/project/res/layout/main.xml b/ndk/apps/san-angeles/project/res/layout/main.xml
index 25dbf6d..ca19a18 100644
--- a/ndk/apps/san-angeles/project/res/layout/main.xml
+++ b/ndk/apps/san-angeles/project/res/layout/main.xml
@@ -1,11 +1,11 @@
<?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:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Hello World, DemoActivity"
/>
diff --git a/samples/ApiDemos/res/layout/activity_animation.xml b/samples/ApiDemos/res/layout/activity_animation.xml
index 446f735..2432c90 100644
--- a/samples/ApiDemos/res/layout/activity_animation.xml
+++ b/samples/ApiDemos/res/layout/activity_animation.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/activity_animation_msg"/>
diff --git a/samples/ApiDemos/res/layout/alarm_controller.xml b/samples/ApiDemos/res/layout/alarm_controller.xml
index 9ce4d72..97ad9f5 100644
--- a/samples/ApiDemos/res/layout/alarm_controller.xml
+++ b/samples/ApiDemos/res/layout/alarm_controller.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/alarm_controller"/>
diff --git a/samples/ApiDemos/res/layout/alarm_service.xml b/samples/ApiDemos/res/layout/alarm_service.xml
index e24369c..e7dac9d 100644
--- a/samples/ApiDemos/res/layout/alarm_service.xml
+++ b/samples/ApiDemos/res/layout/alarm_service.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/alarm_service"/>
diff --git a/samples/ApiDemos/res/layout/alert_dialog.xml b/samples/ApiDemos/res/layout/alert_dialog.xml
index 741be33..0097e7a 100644
--- a/samples/ApiDemos/res/layout/alert_dialog.xml
+++ b/samples/ApiDemos/res/layout/alert_dialog.xml
@@ -18,34 +18,34 @@
See corresponding Java code com.example.android.apis.app.AlertDialogSamples.java. -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/screen"
- 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_height="fill_parent"
+ android:layout_width="match_parent" android:layout_height="match_parent"
android:orientation="vertical">
<Button android:id="@+id/two_buttons"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_two_buttons"/>
<Button android:id="@+id/two_buttons2"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_two_buttons2"/>
<Button android:id="@+id/select_button"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_select_button"/>
<Button android:id="@+id/progress_button"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_progress_button"/>
<Button android:id="@+id/radio_button"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_single_choice"/>
<Button android:id="@+id/checkbox_button"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_multi_choice"/>
<Button android:id="@+id/checkbox_button2"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_multi_choice_cursor"/>
<Button android:id="@+id/text_entry_button"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/alert_dialog_text_entry"/>
</LinearLayout>
</ScrollView>
diff --git a/samples/ApiDemos/res/layout/alert_dialog_text_entry.xml b/samples/ApiDemos/res/layout/alert_dialog_text_entry.xml
index adec305..1f4d093 100644
--- a/samples/ApiDemos/res/layout/alert_dialog_text_entry.xml
+++ b/samples/ApiDemos/res/layout/alert_dialog_text_entry.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:orientation="vertical">
@@ -32,7 +32,7 @@
<EditText
android:id="@+id/username_edit"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
android:scrollHorizontally="true"
@@ -54,7 +54,7 @@
<EditText
android:id="@+id/password_edit"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
android:scrollHorizontally="true"
diff --git a/samples/ApiDemos/res/layout/animation_1.xml b/samples/ApiDemos/res/layout/animation_1.xml
index cd25e04..8380fc4 100644
--- a/samples/ApiDemos/res/layout/animation_1.xml
+++ b/samples/ApiDemos/res/layout/animation_1.xml
@@ -17,18 +17,18 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:padding="10dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dip"
android:text="@string/animation_1_instructions"
/>
<EditText android:id="@+id/pw"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:singleLine="true"
diff --git a/samples/ApiDemos/res/layout/animation_2.xml b/samples/ApiDemos/res/layout/animation_2.xml
index 9f37920..f72753e 100644
--- a/samples/ApiDemos/res/layout/animation_2.xml
+++ b/samples/ApiDemos/res/layout/animation_2.xml
@@ -17,34 +17,34 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:padding="10dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<ViewFlipper android:id="@+id/flipper"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:flipInterval="2000"
android:layout_marginBottom="20dip" >
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textSize="26sp"
android:text="@string/animation_2_text_1"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textSize="26sp"
android:text="@string/animation_2_text_2"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textSize="26sp"
android:text="@string/animation_2_text_3"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textSize="26sp"
@@ -52,14 +52,14 @@
</ViewFlipper>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dip"
android:text="@string/animation_2_instructions"
/>
<Spinner android:id="@+id/spinner"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
diff --git a/samples/ApiDemos/res/layout/animation_3.xml b/samples/ApiDemos/res/layout/animation_3.xml
index 4d1474c..0dcf3fa 100644
--- a/samples/ApiDemos/res/layout/animation_3.xml
+++ b/samples/ApiDemos/res/layout/animation_3.xml
@@ -17,7 +17,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:padding="10dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false">
@@ -29,7 +29,7 @@
android:text="@string/animation_3_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dip"
android:layout_marginBottom="5dip"
@@ -37,7 +37,7 @@
<Spinner
android:id="@+id/spinner"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/animations_main_screen.xml b/samples/ApiDemos/res/layout/animations_main_screen.xml
index ee9e339..88abdd0 100644
--- a/samples/ApiDemos/res/layout/animations_main_screen.xml
+++ b/samples/ApiDemos/res/layout/animations_main_screen.xml
@@ -16,21 +16,21 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/container"
- 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:persistentDrawingCache="animation|scrolling"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:layoutAnimation="@anim/layout_bottom_to_top_slide" />
<ImageView
android:id="@+id/picture"
android:scaleType="fitCenter"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:visibility="gone" />
</FrameLayout>
diff --git a/samples/ApiDemos/res/layout/appwidget_configure.xml b/samples/ApiDemos/res/layout/appwidget_configure.xml
index c041ad6..d018a7b 100644
--- a/samples/ApiDemos/res/layout/appwidget_configure.xml
+++ b/samples/ApiDemos/res/layout/appwidget_configure.xml
@@ -15,20 +15,20 @@
-->
<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="vertical"
>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/appwidget_configure_instructions"
/>
<EditText
android:id="@+id/appwidget_prefix"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
diff --git a/samples/ApiDemos/res/layout/autocomplete_1.xml b/samples/ApiDemos/res/layout/autocomplete_1.xml
index 3c41926..95ab1fd 100644
--- a/samples/ApiDemos/res/layout/autocomplete_1.xml
+++ b/samples/ApiDemos/res/layout/autocomplete_1.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">
<TextView
@@ -26,7 +26,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -35,7 +35,7 @@
android:text="@string/autocomplete_1_country" />
<AutoCompleteTextView android:id="@+id/edit"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/autocomplete_2.xml b/samples/ApiDemos/res/layout/autocomplete_2.xml
index 6d4ee75..40bd34c 100644
--- a/samples/ApiDemos/res/layout/autocomplete_2.xml
+++ b/samples/ApiDemos/res/layout/autocomplete_2.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"
android:gravity="bottom">
<Button
@@ -27,7 +27,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -36,7 +36,7 @@
android:text="@string/autocomplete_2_country" />
<AutoCompleteTextView android:id="@+id/edit"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/autocomplete_3.xml b/samples/ApiDemos/res/layout/autocomplete_3.xml
index e97535a..b1e344f 100644
--- a/samples/ApiDemos/res/layout/autocomplete_3.xml
+++ b/samples/ApiDemos/res/layout/autocomplete_3.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
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
@@ -105,7 +105,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -114,7 +114,7 @@
android:text="@string/autocomplete_3_country" />
<AutoCompleteTextView android:id="@+id/edit"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
@@ -146,7 +146,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -155,7 +155,7 @@
android:text="@string/autocomplete_3_country" />
<AutoCompleteTextView android:id="@+id/edit2"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/autocomplete_4.xml b/samples/ApiDemos/res/layout/autocomplete_4.xml
index 97e5eb9..88be870 100644
--- a/samples/ApiDemos/res/layout/autocomplete_4.xml
+++ b/samples/ApiDemos/res/layout/autocomplete_4.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">
<TextView
@@ -26,7 +26,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -36,7 +36,7 @@
<AutoCompleteTextView android:id="@+id/edit"
android:completionThreshold="1"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/autocomplete_5.xml b/samples/ApiDemos/res/layout/autocomplete_5.xml
index 34f68c6..cdce55d 100644
--- a/samples/ApiDemos/res/layout/autocomplete_5.xml
+++ b/samples/ApiDemos/res/layout/autocomplete_5.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">
<TextView
@@ -26,7 +26,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -37,7 +37,7 @@
<AutoCompleteTextView android:id="@+id/edit"
android:completionThreshold="1"
android:completionHint="@string/autocomplete_5_hint"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/autocomplete_6.xml b/samples/ApiDemos/res/layout/autocomplete_6.xml
index 24fbda1..c80706b 100644
--- a/samples/ApiDemos/res/layout/autocomplete_6.xml
+++ b/samples/ApiDemos/res/layout/autocomplete_6.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">
<TextView
@@ -26,7 +26,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -35,7 +35,7 @@
android:text="@string/autocomplete_7_country" />
<MultiAutoCompleteTextView android:id="@+id/edit"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/baseline_1.xml b/samples/ApiDemos/res/layout/baseline_1.xml
index 0f1c9f6..55912ed 100644
--- a/samples/ApiDemos/res/layout/baseline_1.xml
+++ b/samples/ApiDemos/res/layout/baseline_1.xml
@@ -16,7 +16,7 @@
<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
diff --git a/samples/ApiDemos/res/layout/baseline_2.xml b/samples/ApiDemos/res/layout/baseline_2.xml
index 8e323b6..d6bdc99 100644
--- a/samples/ApiDemos/res/layout/baseline_2.xml
+++ b/samples/ApiDemos/res/layout/baseline_2.xml
@@ -16,8 +16,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
- 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"
diff --git a/samples/ApiDemos/res/layout/baseline_3.xml b/samples/ApiDemos/res/layout/baseline_3.xml
index c251703..0fc10af 100644
--- a/samples/ApiDemos/res/layout/baseline_3.xml
+++ b/samples/ApiDemos/res/layout/baseline_3.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"
@@ -26,7 +26,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_weight="1.0"
android:layout_height="0dip">
diff --git a/samples/ApiDemos/res/layout/baseline_4.xml b/samples/ApiDemos/res/layout/baseline_4.xml
index 5faa9da..c6d055d 100644
--- a/samples/ApiDemos/res/layout/baseline_4.xml
+++ b/samples/ApiDemos/res/layout/baseline_4.xml
@@ -16,8 +16,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
- 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"
diff --git a/samples/ApiDemos/res/layout/baseline_6.xml b/samples/ApiDemos/res/layout/baseline_6.xml
index 5418afb..88e1404 100644
--- a/samples/ApiDemos/res/layout/baseline_6.xml
+++ b/samples/ApiDemos/res/layout/baseline_6.xml
@@ -15,12 +15,12 @@
-->
<RelativeLayout 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">
<EditText android:id="@+id/anchor"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:textSize="20sp"
android:text="@string/baseline_6_multi_line" />
diff --git a/samples/ApiDemos/res/layout/baseline_7.xml b/samples/ApiDemos/res/layout/baseline_7.xml
index 2dc9439..55ab59b 100644
--- a/samples/ApiDemos/res/layout/baseline_7.xml
+++ b/samples/ApiDemos/res/layout/baseline_7.xml
@@ -15,8 +15,8 @@
-->
<RelativeLayout 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">
<TextView android:id="@+id/anchor"
android:layout_width="wrap_content"
diff --git a/samples/ApiDemos/res/layout/baseline_nested_1.xml b/samples/ApiDemos/res/layout/baseline_nested_1.xml
index b940239..160c738 100644
--- a/samples/ApiDemos/res/layout/baseline_nested_1.xml
+++ b/samples/ApiDemos/res/layout/baseline_nested_1.xml
@@ -16,8 +16,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
- 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"
diff --git a/samples/ApiDemos/res/layout/baseline_nested_2.xml b/samples/ApiDemos/res/layout/baseline_nested_2.xml
index 5bc8361..4bb75c2 100644
--- a/samples/ApiDemos/res/layout/baseline_nested_2.xml
+++ b/samples/ApiDemos/res/layout/baseline_nested_2.xml
@@ -16,8 +16,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
- 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"
diff --git a/samples/ApiDemos/res/layout/baseline_nested_3.xml b/samples/ApiDemos/res/layout/baseline_nested_3.xml
index c01c947..eda47a2 100644
--- a/samples/ApiDemos/res/layout/baseline_nested_3.xml
+++ b/samples/ApiDemos/res/layout/baseline_nested_3.xml
@@ -16,8 +16,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
- 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"
diff --git a/samples/ApiDemos/res/layout/buttons_1.xml b/samples/ApiDemos/res/layout/buttons_1.xml
index dc657ef..c25c1b4 100644
--- a/samples/ApiDemos/res/layout/buttons_1.xml
+++ b/samples/ApiDemos/res/layout/buttons_1.xml
@@ -16,8 +16,8 @@
<!-- Lots of buttons = need scrolling -->
<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:layout_width="wrap_content"
diff --git a/samples/ApiDemos/res/layout/chronometer.xml b/samples/ApiDemos/res/layout/chronometer.xml
index b38c2b6..63dc67f 100644
--- a/samples/ApiDemos/res/layout/chronometer.xml
+++ b/samples/ApiDemos/res/layout/chronometer.xml
@@ -16,8 +16,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<Chronometer android:id="@+id/chronometer"
android:format="@string/chronometer_initial_format"
diff --git a/samples/ApiDemos/res/layout/contacts_filter.xml b/samples/ApiDemos/res/layout/contacts_filter.xml
index e8d1615..c120151 100644
--- a/samples/ApiDemos/res/layout/contacts_filter.xml
+++ b/samples/ApiDemos/res/layout/contacts_filter.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/contacts_filter"/>
diff --git a/samples/ApiDemos/res/layout/controls_1.xml b/samples/ApiDemos/res/layout/controls_1.xml
index 29658d7..1aaef3d 100644
--- a/samples/ApiDemos/res/layout/controls_1.xml
+++ b/samples/ApiDemos/res/layout/controls_1.xml
@@ -16,12 +16,12 @@
<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:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/button"
@@ -30,7 +30,7 @@
android:layout_height="wrap_content"/>
<EditText android:id="@+id/edit"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<CheckBox android:id="@+id/check1"
@@ -46,7 +46,7 @@
android:text="@string/controls_1_checkbox_2" />
<RadioGroup
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@@ -77,13 +77,13 @@
android:layout_height="wrap_content" />
<Spinner android:id="@+id/spinner1"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawSelectorOnTop="true"
/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:text="@string/textColorPrimary"
@@ -92,7 +92,7 @@
/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:text="@string/textColorSecondary"
@@ -102,7 +102,7 @@
/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:text="@string/textColorTertiary"
diff --git a/samples/ApiDemos/res/layout/custom_dialog_activity.xml b/samples/ApiDemos/res/layout/custom_dialog_activity.xml
index d706018..971ac0d 100644
--- a/samples/ApiDemos/res/layout/custom_dialog_activity.xml
+++ b/samples/ApiDemos/res/layout/custom_dialog_activity.xml
@@ -19,6 +19,6 @@
<!-- This screen consists of a single text field that displays some text. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_width="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical|center_horizontal"
android:text="@string/custom_dialog_activity_text"/>
diff --git a/samples/ApiDemos/res/layout/custom_title.xml b/samples/ApiDemos/res/layout/custom_title.xml
index dbe8cb6..8cdc584 100644
--- a/samples/ApiDemos/res/layout/custom_title.xml
+++ b/samples/ApiDemos/res/layout/custom_title.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/screen"
- 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"
+ <LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false">
<EditText android:id="@+id/left_text_edit"
@@ -38,7 +38,7 @@
android:layout_gravity="center_vertical"
android:text="@string/custom_title_left_button"/>
</LinearLayout>
- <LinearLayout android:layout_width="fill_parent"
+ <LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false">
<EditText android:id="@+id/right_text_edit"
diff --git a/samples/ApiDemos/res/layout/custom_title_1.xml b/samples/ApiDemos/res/layout/custom_title_1.xml
index f794332..812fbb0 100644
--- a/samples/ApiDemos/res/layout/custom_title_1.xml
+++ b/samples/ApiDemos/res/layout/custom_title_1.xml
@@ -18,7 +18,7 @@
See corresponding Java code com.example.android.apis.app.CustomTitle.java. -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/screen"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_width="match_parent" android:layout_height="match_parent"
android:orientation="vertical">
<TextView android:id="@+id/left_text"
android:layout_width="wrap_content"
diff --git a/samples/ApiDemos/res/layout/custom_view_1.xml b/samples/ApiDemos/res/layout/custom_view_1.xml
index cac91ad..cb8e0f6 100644
--- a/samples/ApiDemos/res/layout/custom_view_1.xml
+++ b/samples/ApiDemos/res/layout/custom_view_1.xml
@@ -19,24 +19,24 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res/com.example.android.apis"
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.example.android.apis.view.LabelView
android:background="@drawable/red"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
app:text="Red"/>
<com.example.android.apis.view.LabelView
android:background="@drawable/blue"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
app:text="Blue" app:textSize="20dp"/>
<com.example.android.apis.view.LabelView
android:background="@drawable/green"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
app:text="Green" app:textColor="#ffffffff" />
diff --git a/samples/ApiDemos/res/layout/date_widgets_example_2.xml b/samples/ApiDemos/res/layout/date_widgets_example_2.xml
index 50b182d..0c99522 100644
--- a/samples/ApiDemos/res/layout/date_widgets_example_2.xml
+++ b/samples/ApiDemos/res/layout/date_widgets_example_2.xml
@@ -22,7 +22,7 @@
<TimePicker android:id="@+id/timePicker"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"/>
+ android:layout_width="match_parent"/>
<TextView android:id="@+id/dateDisplay"
android:layout_width="wrap_content"
diff --git a/samples/ApiDemos/res/layout/dialog_activity.xml b/samples/ApiDemos/res/layout/dialog_activity.xml
index 88c4b07..2b27d9a 100644
--- a/samples/ApiDemos/res/layout/dialog_activity.xml
+++ b/samples/ApiDemos/res/layout/dialog_activity.xml
@@ -19,6 +19,6 @@
<!-- This screen consists of a single text field that displays some text. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_width="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical|center_horizontal"
android:text="@string/dialog_activity_text"/>
diff --git a/samples/ApiDemos/res/layout/focus_1.xml b/samples/ApiDemos/res/layout/focus_1.xml
index 12af0a9..96ab467 100644
--- a/samples/ApiDemos/res/layout/focus_1.xml
+++ b/samples/ApiDemos/res/layout/focus_1.xml
@@ -16,7 +16,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:orientation="vertical">
<TextView android:id="@+id/txtStatus"
@@ -27,12 +27,12 @@
<ListView android:id="@+id/rssListView"
android:background="#7700CC00"
android:layout_height="wrap_content"
- android:layout_width="fill_parent" />
+ android:layout_width="match_parent" />
<WebView android:id="@+id/rssWebView"
android:background="#77CC0000"
android:layout_height="50dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:focusable="false" />
<Button android:layout_height="wrap_content"
diff --git a/samples/ApiDemos/res/layout/focus_2.xml b/samples/ApiDemos/res/layout/focus_2.xml
index 6351de2..0720d5b 100644
--- a/samples/ApiDemos/res/layout/focus_2.xml
+++ b/samples/ApiDemos/res/layout/focus_2.xml
@@ -16,7 +16,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:orientation="horizontal">
<Button android:id="@+id/leftButton"
diff --git a/samples/ApiDemos/res/layout/focus_3.xml b/samples/ApiDemos/res/layout/focus_3.xml
index f08c3f8..f871695 100644
--- a/samples/ApiDemos/res/layout/focus_3.xml
+++ b/samples/ApiDemos/res/layout/focus_3.xml
@@ -18,8 +18,8 @@
focus behavior that would be difficult with default focus calculation alg.-->
<RelativeLayout 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:padding="10dip">
<Button android:id="@+id/top"
diff --git a/samples/ApiDemos/res/layout/foreground_service_controller.xml b/samples/ApiDemos/res/layout/foreground_service_controller.xml
index 4493200..20ce103 100644
--- a/samples/ApiDemos/res/layout/foreground_service_controller.xml
+++ b/samples/ApiDemos/res/layout/foreground_service_controller.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/foreground_service_controller"/>
diff --git a/samples/ApiDemos/res/layout/forward_target.xml b/samples/ApiDemos/res/layout/forward_target.xml
index 6d56ae2..b122955 100644
--- a/samples/ApiDemos/res/layout/forward_target.xml
+++ b/samples/ApiDemos/res/layout/forward_target.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:text="@string/forward_target"/>
diff --git a/samples/ApiDemos/res/layout/forwarding.xml b/samples/ApiDemos/res/layout/forwarding.xml
index a860d88..6f0d8a8 100644
--- a/samples/ApiDemos/res/layout/forwarding.xml
+++ b/samples/ApiDemos/res/layout/forwarding.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/forwarding"/>
diff --git a/samples/ApiDemos/res/layout/gallery_1.xml b/samples/ApiDemos/res/layout/gallery_1.xml
index 40f3443..9b9c4bb 100644
--- a/samples/ApiDemos/res/layout/gallery_1.xml
+++ b/samples/ApiDemos/res/layout/gallery_1.xml
@@ -15,7 +15,7 @@
-->
<Gallery xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/gallery"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
diff --git a/samples/ApiDemos/res/layout/gallery_2.xml b/samples/ApiDemos/res/layout/gallery_2.xml
index 37e5d11..1192bb2 100644
--- a/samples/ApiDemos/res/layout/gallery_2.xml
+++ b/samples/ApiDemos/res/layout/gallery_2.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">
<Button
@@ -28,7 +28,7 @@
/>
<Gallery android:id="@+id/gallery"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:spacing="16dp"
diff --git a/samples/ApiDemos/res/layout/google_login.xml b/samples/ApiDemos/res/layout/google_login.xml
index 9ab2f62..8f1fd8a 100644
--- a/samples/ApiDemos/res/layout/google_login.xml
+++ b/samples/ApiDemos/res/layout/google_login.xml
@@ -18,8 +18,8 @@
See corresponding Java code com.android.sdk.content.StyledText -->
<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">
<Button
@@ -46,14 +46,14 @@
<TextView
android:id="@+id/username_label"
android:visibility="gone"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/googlelogin_user"/>
<TextView
android:id="@+id/username"
android:visibility="gone"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/google_login_username_text"/>
diff --git a/samples/ApiDemos/res/layout/grid_1.xml b/samples/ApiDemos/res/layout/grid_1.xml
index ca60320..765d44b 100644
--- a/samples/ApiDemos/res/layout/grid_1.xml
+++ b/samples/ApiDemos/res/layout/grid_1.xml
@@ -15,8 +15,8 @@
-->
<GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/myGrid"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:padding="10dp"
android:verticalSpacing="10dp"
diff --git a/samples/ApiDemos/res/layout/grid_2.xml b/samples/ApiDemos/res/layout/grid_2.xml
index 4640ab6..eaea658 100644
--- a/samples/ApiDemos/res/layout/grid_2.xml
+++ b/samples/ApiDemos/res/layout/grid_2.xml
@@ -16,8 +16,8 @@
<GridView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/myGrid"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:padding="10dp"
android:verticalSpacing="10dp"
diff --git a/samples/ApiDemos/res/layout/hello_world.xml b/samples/ApiDemos/res/layout/hello_world.xml
index 364a83a..0282076 100644
--- a/samples/ApiDemos/res/layout/hello_world.xml
+++ b/samples/ApiDemos/res/layout/hello_world.xml
@@ -20,6 +20,6 @@
<!-- This screen consists of a single text field that
displays our "Hello, World!" text. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_width="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical|center_horizontal"
android:text="@string/hello_world"/>
diff --git a/samples/ApiDemos/res/layout/image_button_1.xml b/samples/ApiDemos/res/layout/image_button_1.xml
index 114163e..463e706 100644
--- a/samples/ApiDemos/res/layout/image_button_1.xml
+++ b/samples/ApiDemos/res/layout/image_button_1.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">
<ImageButton
diff --git a/samples/ApiDemos/res/layout/image_switcher_1.xml b/samples/ApiDemos/res/layout/image_switcher_1.xml
index d9cd080..0fdf3f9 100644
--- a/samples/ApiDemos/res/layout/image_switcher_1.xml
+++ b/samples/ApiDemos/res/layout/image_switcher_1.xml
@@ -15,19 +15,19 @@
-->
<RelativeLayout 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">
<ImageSwitcher android:id="@+id/switcher"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
/>
<Gallery android:id="@+id/gallery"
android:background="#55000000"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
diff --git a/samples/ApiDemos/res/layout/image_view_1.xml b/samples/ApiDemos/res/layout/image_view_1.xml
index 36b926d..c5e2240 100644
--- a/samples/ApiDemos/res/layout/image_view_1.xml
+++ b/samples/ApiDemos/res/layout/image_view_1.xml
@@ -15,18 +15,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:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical">
<!-- The following four examples use a large image -->
<!-- 1. Non-scaled view, for reference -->
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_large_normal"/>
@@ -38,7 +38,7 @@
<!-- 2. Limit to at most 50x50 -->
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_large_at_most"/>
@@ -52,7 +52,7 @@
<!-- 3. Limit to at most 70x70, with 10 pixels of padding all around -->
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_large_at_most_padded"/>
@@ -68,7 +68,7 @@
<!-- 4. Limit to exactly 70x70, with 10 pixels of padding all around -->
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_large_exactly_padded"/>
@@ -83,7 +83,7 @@
<!-- Repeating the previous four examples with small image -->
<!-- 1. Non-scaled view, for reference -->
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_small_normal"/>
@@ -96,7 +96,7 @@
<!-- 2. Limit to at most 50x50 -->
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_small_at_most"/>
@@ -111,7 +111,7 @@
<!-- 3. Limit to at most 70x70, with 10 pixels of padding all around -->
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_small_at_most_padded"/>
@@ -127,7 +127,7 @@
<!-- 4. Limit to exactly 70x70, with 10 pixels of padding all around -->
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/image_view_small_exactly_padded"/>
diff --git a/samples/ApiDemos/res/layout/incoming_message.xml b/samples/ApiDemos/res/layout/incoming_message.xml
index 01ea04a..3c0d92a 100644
--- a/samples/ApiDemos/res/layout/incoming_message.xml
+++ b/samples/ApiDemos/res/layout/incoming_message.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">
<Button
android:id="@+id/notify"
diff --git a/samples/ApiDemos/res/layout/incoming_message_info.xml b/samples/ApiDemos/res/layout/incoming_message_info.xml
index 723a4da..fef2556 100644
--- a/samples/ApiDemos/res/layout/incoming_message_info.xml
+++ b/samples/ApiDemos/res/layout/incoming_message_info.xml
@@ -16,7 +16,7 @@
<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">
<ImageView
diff --git a/samples/ApiDemos/res/layout/incoming_message_panel.xml b/samples/ApiDemos/res/layout/incoming_message_panel.xml
index 3120e4e..bdd808e 100644
--- a/samples/ApiDemos/res/layout/incoming_message_panel.xml
+++ b/samples/ApiDemos/res/layout/incoming_message_panel.xml
@@ -15,13 +15,13 @@
-->
<FrameLayout 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:background="@android:drawable/toast_frame">
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
diff --git a/samples/ApiDemos/res/layout/incoming_message_view.xml b/samples/ApiDemos/res/layout/incoming_message_view.xml
index b286e6e..b2daf4e 100644
--- a/samples/ApiDemos/res/layout/incoming_message_view.xml
+++ b/samples/ApiDemos/res/layout/incoming_message_view.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"
android:paddingLeft="4dip"
android:paddingRight="4dip"
android:paddingTop="4dip"
@@ -25,7 +25,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
>
diff --git a/samples/ApiDemos/res/layout/intents.xml b/samples/ApiDemos/res/layout/intents.xml
index 023e4e8..5531235 100644
--- a/samples/ApiDemos/res/layout/intents.xml
+++ b/samples/ApiDemos/res/layout/intents.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/intents"/>
diff --git a/samples/ApiDemos/res/layout/launcher_shortcuts.xml b/samples/ApiDemos/res/layout/launcher_shortcuts.xml
index c8fbb2a..1debbd3 100644
--- a/samples/ApiDemos/res/layout/launcher_shortcuts.xml
+++ b/samples/ApiDemos/res/layout/launcher_shortcuts.xml
@@ -17,13 +17,13 @@
<!-- This activity provides information about launcher shortcuts -->
<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">
<!-- Section: Information -->
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="4dip"
android:text="@string/msg_launcher_shortcuts" />
diff --git a/samples/ApiDemos/res/layout/layout_animation_1.xml b/samples/ApiDemos/res/layout/layout_animation_1.xml
index 2b25485..d70a583 100644
--- a/samples/ApiDemos/res/layout/layout_animation_1.xml
+++ b/samples/ApiDemos/res/layout/layout_animation_1.xml
@@ -17,8 +17,8 @@
<GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid"
android:layoutAnimation="@anim/layout_grid_fade"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:padding="10dp"
android:verticalSpacing="10dp"
diff --git a/samples/ApiDemos/res/layout/layout_animation_3.xml b/samples/ApiDemos/res/layout/layout_animation_3.xml
index 051fa8e..3ddaab7 100644
--- a/samples/ApiDemos/res/layout/layout_animation_3.xml
+++ b/samples/ApiDemos/res/layout/layout_animation_3.xml
@@ -16,6 +16,6 @@
<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:layoutAnimation="@anim/layout_bottom_to_top_slide" />
diff --git a/samples/ApiDemos/res/layout/layout_animation_4.xml b/samples/ApiDemos/res/layout/layout_animation_4.xml
index 73b99b0..0b74898 100644
--- a/samples/ApiDemos/res/layout/layout_animation_4.xml
+++ b/samples/ApiDemos/res/layout/layout_animation_4.xml
@@ -17,8 +17,8 @@
<GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid"
android:layoutAnimation="@anim/layout_random_fade"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:padding="10dp"
android:verticalSpacing="10dp"
diff --git a/samples/ApiDemos/res/layout/layout_animation_5.xml b/samples/ApiDemos/res/layout/layout_animation_5.xml
index 602fb18..ff34b43 100644
--- a/samples/ApiDemos/res/layout/layout_animation_5.xml
+++ b/samples/ApiDemos/res/layout/layout_animation_5.xml
@@ -17,8 +17,8 @@
<GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid"
android:layoutAnimation="@anim/layout_grid_inverse_fade"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:padding="10dp"
android:verticalSpacing="10dp"
diff --git a/samples/ApiDemos/res/layout/layout_animation_6.xml b/samples/ApiDemos/res/layout/layout_animation_6.xml
index 026797e..f6cfad8 100644
--- a/samples/ApiDemos/res/layout/layout_animation_6.xml
+++ b/samples/ApiDemos/res/layout/layout_animation_6.xml
@@ -17,8 +17,8 @@
<GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid"
android:layoutAnimation="@anim/layout_wave_scale"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:verticalSpacing="10dp"
android:horizontalSpacing="10dp"
diff --git a/samples/ApiDemos/res/layout/layout_animation_7.xml b/samples/ApiDemos/res/layout/layout_animation_7.xml
index 38260c7..b672c37 100644
--- a/samples/ApiDemos/res/layout/layout_animation_7.xml
+++ b/samples/ApiDemos/res/layout/layout_animation_7.xml
@@ -19,8 +19,8 @@
android:animationCache="false"
android:clipToPadding="false"
android:padding="12dp"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:stretchColumns="1">
<TableRow
diff --git a/samples/ApiDemos/res/layout/linear_layout_1.xml b/samples/ApiDemos/res/layout/linear_layout_1.xml
index ef01ced..be3e77d 100644
--- a/samples/ApiDemos/res/layout/linear_layout_1.xml
+++ b/samples/ApiDemos/res/layout/linear_layout_1.xml
@@ -19,27 +19,27 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:background="@drawable/blue"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- view1 goes on top -->
<TextView
android:background="@drawable/box"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_1_top"/>
<!-- view2 goes in the middle -->
<TextView
android:background="@drawable/box"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_1_middle"/>
<!-- view3 goes on the bottom -->
<TextView
android:background="@drawable/box"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_1_bottom"/>
diff --git a/samples/ApiDemos/res/layout/linear_layout_10.xml b/samples/ApiDemos/res/layout/linear_layout_10.xml
index eb793fd..4c04474 100644
--- a/samples/ApiDemos/res/layout/linear_layout_10.xml
+++ b/samples/ApiDemos/res/layout/linear_layout_10.xml
@@ -18,14 +18,14 @@
TextViews, EditTexts, and Buttons. -->
<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="vertical">
<!-- Top label/button text field. -->
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:addStatesFromChildren="true"
android:gravity="center_vertical"
@@ -74,7 +74,7 @@
except for the label.) -->
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:addStatesFromChildren="true"
android:gravity="center_vertical"
diff --git a/samples/ApiDemos/res/layout/linear_layout_2.xml b/samples/ApiDemos/res/layout/linear_layout_2.xml
index 3cacccc..6ccfd75 100644
--- a/samples/ApiDemos/res/layout/linear_layout_2.xml
+++ b/samples/ApiDemos/res/layout/linear_layout_2.xml
@@ -19,27 +19,27 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:background="@drawable/blue"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<!-- view1 goes on top -->
<TextView
android:background="@drawable/box"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_2_top"/>
<!-- view2 goes in the middle -->
<TextView
android:background="@drawable/box"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_2_middle"/>
<!-- view3 goes on the bottom -->
<TextView
android:background="@drawable/box"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_2_bottom"/>
diff --git a/samples/ApiDemos/res/layout/linear_layout_3.xml b/samples/ApiDemos/res/layout/linear_layout_3.xml
index 2b9b327..683b7eb 100644
--- a/samples/ApiDemos/res/layout/linear_layout_3.xml
+++ b/samples/ApiDemos/res/layout/linear_layout_3.xml
@@ -23,20 +23,20 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:background="@drawable/blue"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<!-- view1 goes on top -->
<TextView
android:background="@drawable/box"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_3_top"/>
<!-- view2 goes in the middle -->
<TextView
android:background="@drawable/box"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/linear_layout_3_middle"/>
@@ -44,7 +44,7 @@
<!-- view3 goes on the bottom -->
<TextView
android:background="@drawable/box"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_3_bottom"/>
diff --git a/samples/ApiDemos/res/layout/linear_layout_4.xml b/samples/ApiDemos/res/layout/linear_layout_4.xml
index 139fb57..3ba0282 100644
--- a/samples/ApiDemos/res/layout/linear_layout_4.xml
+++ b/samples/ApiDemos/res/layout/linear_layout_4.xml
@@ -20,31 +20,31 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<TextView
android:background="@drawable/red"
android:layout_width="0dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_weight="1"/>
<TextView
android:background="@drawable/green"
android:layout_width="0dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_weight="1"/>
<TextView
android:background="@drawable/blue"
android:layout_width="0dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_weight="1"/>
<TextView
android:background="@drawable/yellow"
android:layout_width="0dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_weight="1"/>
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/linear_layout_5.xml b/samples/ApiDemos/res/layout/linear_layout_5.xml
index 832a103..b5d45c0 100644
--- a/samples/ApiDemos/res/layout/linear_layout_5.xml
+++ b/samples/ApiDemos/res/layout/linear_layout_5.xml
@@ -21,7 +21,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:background="@drawable/blue"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dip">
@@ -29,7 +29,7 @@
TextView goes on top...
-->
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_5_instructions"/>
@@ -42,7 +42,7 @@
an application resource.
-->
<EditText
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:drawable/editbox_background"/>
@@ -51,7 +51,7 @@
This item has layout_gravity="right". This means the whole
horizontal LinearLayout is right aligned, not the individual
items within it. The horizontal LinearLayout's width is set to
- wrap_content. (If it was fill_parent it would not have any
+ wrap_content. (If it was match_parent it would not have any
room to slide to the right.)
-->
<LinearLayout
diff --git a/samples/ApiDemos/res/layout/linear_layout_6.xml b/samples/ApiDemos/res/layout/linear_layout_6.xml
index f4bb6a7..da9d814 100644
--- a/samples/ApiDemos/res/layout/linear_layout_6.xml
+++ b/samples/ApiDemos/res/layout/linear_layout_6.xml
@@ -16,7 +16,7 @@
<!--
LinearLayout which uses a combination of wrap_content on itself and
- fill_parent on its children to get every item to be the same width.
+ match_parent on its children to get every item to be the same width.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -28,25 +28,25 @@
<TextView
android:background="@drawable/box"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_6_one"/>
<TextView
android:background="@drawable/box"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_6_two"/>
<TextView
android:background="@drawable/box"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_6_three"/>
<TextView
android:background="@drawable/box"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_6_four"/>
diff --git a/samples/ApiDemos/res/layout/linear_layout_7.xml b/samples/ApiDemos/res/layout/linear_layout_7.xml
index 19b22e5..5986565 100644
--- a/samples/ApiDemos/res/layout/linear_layout_7.xml
+++ b/samples/ApiDemos/res/layout/linear_layout_7.xml
@@ -20,27 +20,27 @@
-->
<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:background="@drawable/red"
android:layout_width="0dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/linear_layout_7_small"/>
<TextView
android:background="@drawable/green"
android:layout_width="0dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/linear_layout_7_big"/>
<TextView
android:background="@drawable/blue"
android:layout_width="0dip"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/linear_layout_7_small" />
diff --git a/samples/ApiDemos/res/layout/linear_layout_8.xml b/samples/ApiDemos/res/layout/linear_layout_8.xml
index f226043..763edca 100644
--- a/samples/ApiDemos/res/layout/linear_layout_8.xml
+++ b/samples/ApiDemos/res/layout/linear_layout_8.xml
@@ -19,15 +19,15 @@
children stacked from the top.
-->
<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"
android:padding="30dip">
<LinearLayout
android:id="@+id/layout"
android:orientation="vertical"
android:background="@drawable/blue"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:padding="30dip">
<TextView
diff --git a/samples/ApiDemos/res/layout/linear_layout_9.xml b/samples/ApiDemos/res/layout/linear_layout_9.xml
index eb91147..67eaf00 100644
--- a/samples/ApiDemos/res/layout/linear_layout_9.xml
+++ b/samples/ApiDemos/res/layout/linear_layout_9.xml
@@ -21,16 +21,16 @@
<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/list"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.0" />
<Button
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/linear_layout_9_button" />
diff --git a/samples/ApiDemos/res/layout/link.xml b/samples/ApiDemos/res/layout/link.xml
index a65d000..d4eaf0c 100644
--- a/samples/ApiDemos/res/layout/link.xml
+++ b/samples/ApiDemos/res/layout/link.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">
<!-- Four TextView widgets, each one displaying text containing links. -->
@@ -24,8 +24,8 @@
<!-- text1 automatically linkifies things like URLs and phone numbers. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/text1"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:autoLink="all"
android:text="@string/link_text_auto"
/>
@@ -34,23 +34,23 @@
specify links. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/text2"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:text="@string/link_text_manual"
/>
<!-- text3 builds the text in the Java code using HTML. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/text3"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
/>
<!-- text4 builds the text in the Java code without using HTML. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/text4"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
/>
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/list_12.xml b/samples/ApiDemos/res/layout/list_12.xml
index 7f19b58..eef6481 100644
--- a/samples/ApiDemos/res/layout/list_12.xml
+++ b/samples/ApiDemos/res/layout/list_12.xml
@@ -16,20 +16,20 @@
<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="8dip"
android:paddingRight="8dip">
<ListView android:id="@android:id/list"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:stackFromBottom="true"
android:transcriptMode="normal"/>
<EditText android:id="@+id/userText"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/list_13.xml b/samples/ApiDemos/res/layout/list_13.xml
index 681b46e..72f2f58 100644
--- a/samples/ApiDemos/res/layout/list_13.xml
+++ b/samples/ApiDemos/res/layout/list_13.xml
@@ -16,17 +16,17 @@
<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_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:drawSelectorOnTop="false"/>
<TextView android:id="@+id/status"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="8dip"
android:paddingRight="8dip"/>
diff --git a/samples/ApiDemos/res/layout/list_7.xml b/samples/ApiDemos/res/layout/list_7.xml
index dfaf093..c16c9ac 100644
--- a/samples/ApiDemos/res/layout/list_7.xml
+++ b/samples/ApiDemos/res/layout/list_7.xml
@@ -16,19 +16,19 @@
<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="8dip"
android:paddingRight="8dip">
<ListView android:id="@android:id/list"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:drawSelectorOnTop="false"/>
<TextView android:id="@+id/phone"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/blue"/>
diff --git a/samples/ApiDemos/res/layout/list_8.xml b/samples/ApiDemos/res/layout/list_8.xml
index a88b67c..ef5410c 100644
--- a/samples/ApiDemos/res/layout/list_8.xml
+++ b/samples/ApiDemos/res/layout/list_8.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">
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/add"
@@ -39,21 +39,21 @@
<!-- The frame layout is here since we will be showing either
the empty view or the list view. -->
<FrameLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1" >
<!-- Here is the list. Since we are using a ListActivity, we
have to call it "@android:id/list" so ListActivity will
find it -->
<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"/>
<!-- Here is the view to show if the list is emtpy -->
<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:text="@string/list_8_no_photos"/>
</FrameLayout>
diff --git a/samples/ApiDemos/res/layout/list_item_checkbox.xml b/samples/ApiDemos/res/layout/list_item_checkbox.xml
index fa1d2d8..a26f6f6 100644
--- a/samples/ApiDemos/res/layout/list_item_checkbox.xml
+++ b/samples/ApiDemos/res/layout/list_item_checkbox.xml
@@ -16,7 +16,7 @@
<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:textAppearance="?android:attr/textAppearanceLarge"
/>
diff --git a/samples/ApiDemos/res/layout/list_item_icon_text.xml b/samples/ApiDemos/res/layout/list_item_icon_text.xml
index 7206c04..85eda7a 100644
--- a/samples/ApiDemos/res/layout/list_item_icon_text.xml
+++ b/samples/ApiDemos/res/layout/list_item_icon_text.xml
@@ -16,8 +16,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<ImageView android:id="@+id/icon"
android:layout_width="48dip"
diff --git a/samples/ApiDemos/res/layout/local_sample.xml b/samples/ApiDemos/res/layout/local_sample.xml
index e662921..70a9c6b 100644
--- a/samples/ApiDemos/res/layout/local_sample.xml
+++ b/samples/ApiDemos/res/layout/local_sample.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/local_sample"/>
diff --git a/samples/ApiDemos/res/layout/local_service_binding.xml b/samples/ApiDemos/res/layout/local_service_binding.xml
index 775b8fb..6f04ab1 100644
--- a/samples/ApiDemos/res/layout/local_service_binding.xml
+++ b/samples/ApiDemos/res/layout/local_service_binding.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/local_service_binding"/>
diff --git a/samples/ApiDemos/res/layout/local_service_controller.xml b/samples/ApiDemos/res/layout/local_service_controller.xml
index 7bb02ca..30298d0 100644
--- a/samples/ApiDemos/res/layout/local_service_controller.xml
+++ b/samples/ApiDemos/res/layout/local_service_controller.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/local_service_controller"/>
diff --git a/samples/ApiDemos/res/layout/log_text_box_1.xml b/samples/ApiDemos/res/layout/log_text_box_1.xml
index f06619d..4d2c774 100644
--- a/samples/ApiDemos/res/layout/log_text_box_1.xml
+++ b/samples/ApiDemos/res/layout/log_text_box_1.xml
@@ -17,8 +17,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">
<Button
android:id="@+id/add"
@@ -29,7 +29,7 @@
<com.example.android.apis.text.LogTextBox
android:id="@+id/text"
android:background="@drawable/box"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:scrollbars="vertical"/>
diff --git a/samples/ApiDemos/res/layout/mapview.xml b/samples/ApiDemos/res/layout/mapview.xml
index 97ef7ff..664d8f6 100644
--- a/samples/ApiDemos/res/layout/mapview.xml
+++ b/samples/ApiDemos/res/layout/mapview.xml
@@ -19,11 +19,11 @@
<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">
<com.google.android.maps.MapView
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:enabled="true"
android:clickable="true"
android:apiKey="apisamples"
diff --git a/samples/ApiDemos/res/layout/marquee.xml b/samples/ApiDemos/res/layout/marquee.xml
index 6d40c84..6266ff2 100644
--- a/samples/ApiDemos/res/layout/marquee.xml
+++ b/samples/ApiDemos/res/layout/marquee.xml
@@ -17,8 +17,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">
<Button
android:layout_width="150dip"
diff --git a/samples/ApiDemos/res/layout/mediaplayer_1.xml b/samples/ApiDemos/res/layout/mediaplayer_1.xml
index 16ae61b..7411e40 100644
--- a/samples/ApiDemos/res/layout/mediaplayer_1.xml
+++ b/samples/ApiDemos/res/layout/mediaplayer_1.xml
@@ -1,30 +1,30 @@
<?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"
>
<Button android:id="@+id/localvideo"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:text="@string/local_video"
/>
<Button android:id="@+id/streamvideo"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:text="@string/stream_video"
/>
<Button android:id="@+id/localaudio"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:text="@string/local_audio"
/>
<Button android:id="@+id/resourcesaudio"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:text="@string/res_audio"
/>
diff --git a/samples/ApiDemos/res/layout/mediaplayer_2.xml b/samples/ApiDemos/res/layout/mediaplayer_2.xml
index e1e49dd..a7f78f6 100644
--- a/samples/ApiDemos/res/layout/mediaplayer_2.xml
+++ b/samples/ApiDemos/res/layout/mediaplayer_2.xml
@@ -1,8 +1,8 @@
<?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">
<SurfaceView android:id="@+id/surface"
android:layout_width="wrap_content"
diff --git a/samples/ApiDemos/res/layout/morse_code.xml b/samples/ApiDemos/res/layout/morse_code.xml
index f536da2..3c7993c 100644
--- a/samples/ApiDemos/res/layout/morse_code.xml
+++ b/samples/ApiDemos/res/layout/morse_code.xml
@@ -17,13 +17,13 @@
<!-- This activity exercises search invocation options -->
<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">
<EditText
android:id="@+id/text"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="4dip"
/>
diff --git a/samples/ApiDemos/res/layout/notify_with_text.xml b/samples/ApiDemos/res/layout/notify_with_text.xml
index 6cba90d..e1b6834 100644
--- a/samples/ApiDemos/res/layout/notify_with_text.xml
+++ b/samples/ApiDemos/res/layout/notify_with_text.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">
<Button
android:id="@+id/short_notify"
diff --git a/samples/ApiDemos/res/layout/notifying_controller.xml b/samples/ApiDemos/res/layout/notifying_controller.xml
index 54cef17..30cdb24 100644
--- a/samples/ApiDemos/res/layout/notifying_controller.xml
+++ b/samples/ApiDemos/res/layout/notifying_controller.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/notifying_service_controller"/>
diff --git a/samples/ApiDemos/res/layout/progressbar_1.xml b/samples/ApiDemos/res/layout/progressbar_1.xml
index 0383de9..9e3acb1 100644
--- a/samples/ApiDemos/res/layout/progressbar_1.xml
+++ b/samples/ApiDemos/res/layout/progressbar_1.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">
<ProgressBar android:id="@+id/progress_horizontal"
@@ -34,7 +34,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/decrease"
@@ -56,7 +56,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/decrease_secondary"
diff --git a/samples/ApiDemos/res/layout/progressbar_2.xml b/samples/ApiDemos/res/layout/progressbar_2.xml
index 2d43622..0c3f63c 100644
--- a/samples/ApiDemos/res/layout/progressbar_2.xml
+++ b/samples/ApiDemos/res/layout/progressbar_2.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">
<ProgressBar android:id="@+android:id/progress_large"
diff --git a/samples/ApiDemos/res/layout/progressbar_3.xml b/samples/ApiDemos/res/layout/progressbar_3.xml
index ac10a30..0c43708 100644
--- a/samples/ApiDemos/res/layout/progressbar_3.xml
+++ b/samples/ApiDemos/res/layout/progressbar_3.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">
<Button android:id="@+id/showIndeterminate"
diff --git a/samples/ApiDemos/res/layout/progressbar_4.xml b/samples/ApiDemos/res/layout/progressbar_4.xml
index 5e577a0..6bacf7a 100644
--- a/samples/ApiDemos/res/layout/progressbar_4.xml
+++ b/samples/ApiDemos/res/layout/progressbar_4.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">
<Button android:id="@+id/toggle"
diff --git a/samples/ApiDemos/res/layout/quick_contacts.xml b/samples/ApiDemos/res/layout/quick_contacts.xml
index ffb19ed..a34fea2 100644
--- a/samples/ApiDemos/res/layout/quick_contacts.xml
+++ b/samples/ApiDemos/res/layout/quick_contacts.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:paddingLeft="0dip"
android:paddingRight="9dip"
android:layout_height= "wrap_content"
@@ -41,7 +41,7 @@
android:paddingLeft="2dip"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/badge"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
</RelativeLayout>
diff --git a/samples/ApiDemos/res/layout/radio_group_1.xml b/samples/ApiDemos/res/layout/radio_group_1.xml
index 3029207..a17f9d3 100644
--- a/samples/ApiDemos/res/layout/radio_group_1.xml
+++ b/samples/ApiDemos/res/layout/radio_group_1.xml
@@ -15,11 +15,11 @@
-->
<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">
<RadioGroup
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:checkedButton="@+id/lunch"
diff --git a/samples/ApiDemos/res/layout/ratingbar_1.xml b/samples/ApiDemos/res/layout/ratingbar_1.xml
index 3256d3c..9f81505 100644
--- a/samples/ApiDemos/res/layout/ratingbar_1.xml
+++ b/samples/ApiDemos/res/layout/ratingbar_1.xml
@@ -17,8 +17,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:paddingLeft="10dip"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<RatingBar android:id="@+id/ratingbar1"
android:layout_width="wrap_content"
@@ -33,7 +33,7 @@
android:rating="2.25" />
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dip">
diff --git a/samples/ApiDemos/res/layout/read_asset.xml b/samples/ApiDemos/res/layout/read_asset.xml
index 79b8bb6..c3423bf 100644
--- a/samples/ApiDemos/res/layout/read_asset.xml
+++ b/samples/ApiDemos/res/layout/read_asset.xml
@@ -18,11 +18,11 @@
See corresponding Java code com.android.sdk.content.StyledText -->
<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">
<TextView android:id="@+id/text"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textStyle="normal"/>
diff --git a/samples/ApiDemos/res/layout/receive_result.xml b/samples/ApiDemos/res/layout/receive_result.xml
index 461be6c..a894612 100644
--- a/samples/ApiDemos/res/layout/receive_result.xml
+++ b/samples/ApiDemos/res/layout/receive_result.xml
@@ -21,16 +21,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/receive_result_instructions"/>
<TextView android:id="@+id/results"
- android:layout_width="fill_parent" android:layout_height="10dip"
+ android:layout_width="match_parent" android:layout_height="10dip"
android:layout_weight="1"
android:paddingBottom="4dip"
android:background="@drawable/green">
diff --git a/samples/ApiDemos/res/layout/redirect_enter.xml b/samples/ApiDemos/res/layout/redirect_enter.xml
index f73d999..6b4493e 100644
--- a/samples/ApiDemos/res/layout/redirect_enter.xml
+++ b/samples/ApiDemos/res/layout/redirect_enter.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/redirect_enter"/>
diff --git a/samples/ApiDemos/res/layout/redirect_getter.xml b/samples/ApiDemos/res/layout/redirect_getter.xml
index 9879b78..c4e3bd7 100644
--- a/samples/ApiDemos/res/layout/redirect_getter.xml
+++ b/samples/ApiDemos/res/layout/redirect_getter.xml
@@ -19,16 +19,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/redirect_getter"/>
<EditText android:id="@+id/text"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip">
<requestFocus />
diff --git a/samples/ApiDemos/res/layout/redirect_main.xml b/samples/ApiDemos/res/layout/redirect_main.xml
index 74de502..a54a9df 100644
--- a/samples/ApiDemos/res/layout/redirect_main.xml
+++ b/samples/ApiDemos/res/layout/redirect_main.xml
@@ -19,16 +19,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/redirect_main"/>
<TextView android:id="@+id/text"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip" />
diff --git a/samples/ApiDemos/res/layout/relative_layout_1.xml b/samples/ApiDemos/res/layout/relative_layout_1.xml
index 122e718..94f76e8 100644
--- a/samples/ApiDemos/res/layout/relative_layout_1.xml
+++ b/samples/ApiDemos/res/layout/relative_layout_1.xml
@@ -19,14 +19,14 @@
-->
<RelativeLayout 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">
<!-- view1 goes on top -->
<TextView
android:id="@+id/view1"
android:background="@drawable/red"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:text="@string/relative_layout_1_top"/>
@@ -35,7 +35,7 @@
<TextView
android:id="@+id/view2"
android:background="@drawable/green"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:text="@string/relative_layout_1_bottom"/>
@@ -44,7 +44,7 @@
<TextView
android:id="@+id/view3"
android:background="@drawable/yellow"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_above="@id/view2"
android:layout_below="@id/view1"
diff --git a/samples/ApiDemos/res/layout/relative_layout_2.xml b/samples/ApiDemos/res/layout/relative_layout_2.xml
index dc613e6..083953a 100644
--- a/samples/ApiDemos/res/layout/relative_layout_2.xml
+++ b/samples/ApiDemos/res/layout/relative_layout_2.xml
@@ -17,7 +17,7 @@
<!-- Demonstrates using a relative layout to create a form -->
<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"
android:background="@drawable/blue"
android:padding="10dip">
@@ -27,7 +27,7 @@
-->
<TextView
android:id="@+id/label"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/relative_layout_2_instructions"/>
@@ -40,7 +40,7 @@
-->
<EditText
android:id="@+id/entry"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:drawable/editbox_background"
android:layout_below="@id/label"/>
diff --git a/samples/ApiDemos/res/layout/remote_service_binding.xml b/samples/ApiDemos/res/layout/remote_service_binding.xml
index a353efb..cc408d1 100644
--- a/samples/ApiDemos/res/layout/remote_service_binding.xml
+++ b/samples/ApiDemos/res/layout/remote_service_binding.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/remote_service_binding"/>
@@ -44,7 +44,7 @@
</Button>
<TextView android:id="@+id/callback"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal" android:paddingTop="4dip"/>
diff --git a/samples/ApiDemos/res/layout/remote_service_controller.xml b/samples/ApiDemos/res/layout/remote_service_controller.xml
index 48e4c95..61d770f 100644
--- a/samples/ApiDemos/res/layout/remote_service_controller.xml
+++ b/samples/ApiDemos/res/layout/remote_service_controller.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/remote_service_controller"/>
diff --git a/samples/ApiDemos/res/layout/reorder_four.xml b/samples/ApiDemos/res/layout/reorder_four.xml
index 45f13a3..a5c22b5 100644
--- a/samples/ApiDemos/res/layout/reorder_four.xml
+++ b/samples/ApiDemos/res/layout/reorder_four.xml
@@ -21,11 +21,11 @@
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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/reorder_four_text"/>
diff --git a/samples/ApiDemos/res/layout/reorder_on_launch.xml b/samples/ApiDemos/res/layout/reorder_on_launch.xml
index 850a2f5..981b3f4 100644
--- a/samples/ApiDemos/res/layout/reorder_on_launch.xml
+++ b/samples/ApiDemos/res/layout/reorder_on_launch.xml
@@ -21,11 +21,11 @@
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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/reorder_on_launch"/>
diff --git a/samples/ApiDemos/res/layout/reorder_three.xml b/samples/ApiDemos/res/layout/reorder_three.xml
index 30ef41b..51a8d0c 100644
--- a/samples/ApiDemos/res/layout/reorder_three.xml
+++ b/samples/ApiDemos/res/layout/reorder_three.xml
@@ -21,11 +21,11 @@
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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/reorder_three_text"/>
diff --git a/samples/ApiDemos/res/layout/reorder_two.xml b/samples/ApiDemos/res/layout/reorder_two.xml
index 7132561..6fadca0 100644
--- a/samples/ApiDemos/res/layout/reorder_two.xml
+++ b/samples/ApiDemos/res/layout/reorder_two.xml
@@ -21,11 +21,11 @@
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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/reorder_two_text"/>
diff --git a/samples/ApiDemos/res/layout/resources.xml b/samples/ApiDemos/res/layout/resources.xml
index 60ec581..ee9dac0 100644
--- a/samples/ApiDemos/res/layout/resources.xml
+++ b/samples/ApiDemos/res/layout/resources.xml
@@ -22,13 +22,13 @@
-->
<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">
<TextView
android:id="@+id/styled_text"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textStyle="normal"
@@ -36,7 +36,7 @@
<TextView
android:id="@+id/plain_text"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textStyle="normal"
@@ -44,7 +44,7 @@
<TextView
android:id="@+id/res1"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textStyle="normal"
diff --git a/samples/ApiDemos/res/layout/save_restore_state.xml b/samples/ApiDemos/res/layout/save_restore_state.xml
index 4f3f8ee..4b489ed 100644
--- a/samples/ApiDemos/res/layout/save_restore_state.xml
+++ b/samples/ApiDemos/res/layout/save_restore_state.xml
@@ -18,21 +18,21 @@
See corresponding Java code com.android.sdk.app.SaveRestoreState.java. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:padding="4dip"
- android:layout_width="fill_parent" android:layout_height="fill_parent">
+ android:layout_width="match_parent" android:layout_height="match_parent">
<TextView android:id="@+id/msg"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip" />
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/saves_state"/>
<EditText android:id="@+id/saved"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/green"
android:text="@string/initial_text"
@@ -41,14 +41,14 @@
</EditText>
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingTop="8dip"
android:paddingBottom="4dip"
android:text="@string/no_saves_state"/>
<EditText
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/red"
android:text="@string/initial_text">
diff --git a/samples/ApiDemos/res/layout/scroll_view_1.xml b/samples/ApiDemos/res/layout/scroll_view_1.xml
index 0552807..4792e21 100644
--- a/samples/ApiDemos/res/layout/scroll_view_1.xml
+++ b/samples/ApiDemos/res/layout/scroll_view_1.xml
@@ -17,72 +17,72 @@
<!-- Demonstrates scrolling with a ScrollView. -->
<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"
android:scrollbars="none">
<LinearLayout
android:id="@+id/layout"
android:orientation="vertical"
- android:layout_width="fill_parent" android:layout_height="wrap_content">
+ android:layout_width="match_parent" android:layout_height="wrap_content">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scroll_view_1_text_1"/>
<Button
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scroll_view_1_button_1"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scroll_view_1_text_2"/>
<Button
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scroll_view_1_button_2"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scroll_view_1_text_3"/>
<Button
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scroll_view_1_button_3"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scroll_view_1_text_4"/>
<Button
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scroll_view_1_button_4"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scroll_view_1_text_5"/>
<Button
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scroll_view_1_button_5"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scroll_view_1_text_6"/>
<Button
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scroll_view_1_button_6"/>
diff --git a/samples/ApiDemos/res/layout/scroll_view_2.xml b/samples/ApiDemos/res/layout/scroll_view_2.xml
index 0107e46..d8587cf 100644
--- a/samples/ApiDemos/res/layout/scroll_view_2.xml
+++ b/samples/ApiDemos/res/layout/scroll_view_2.xml
@@ -17,23 +17,23 @@
<!-- Demonstrates scrolling with a ScrollView. -->
<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"
android:scrollbars="none">
<LinearLayout
android:id="@+id/layout"
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scroll_view_2_text_1"/>
<Button
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scroll_view_2_button_1"/>
diff --git a/samples/ApiDemos/res/layout/scrollbar1.xml b/samples/ApiDemos/res/layout/scrollbar1.xml
index 7221b3e..7a5b86e 100644
--- a/samples/ApiDemos/res/layout/scrollbar1.xml
+++ b/samples/ApiDemos/res/layout/scrollbar1.xml
@@ -17,152 +17,152 @@
<!-- Demonstrates scrolling with a ScrollView. -->
<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:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_1_text"/>
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/scrollbar2.xml b/samples/ApiDemos/res/layout/scrollbar2.xml
index 4882a72..92ad19f 100644
--- a/samples/ApiDemos/res/layout/scrollbar2.xml
+++ b/samples/ApiDemos/res/layout/scrollbar2.xml
@@ -17,7 +17,7 @@
<!-- Demonstrates scrolling with a ScrollView. -->
<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"
android:scrollbarTrackVertical="@drawable/scrollbar_vertical_track"
android:scrollbarThumbVertical="@drawable/scrollbar_vertical_thumb"
@@ -25,147 +25,147 @@
<LinearLayout
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text"/>
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/scrollbar3.xml b/samples/ApiDemos/res/layout/scrollbar3.xml
index c272e45..fa20db0 100644
--- a/samples/ApiDemos/res/layout/scrollbar3.xml
+++ b/samples/ApiDemos/res/layout/scrollbar3.xml
@@ -18,12 +18,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="wrap_content"
android:orientation="horizontal">
@@ -33,47 +33,47 @@
android:background="#FF0000">
<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/scrollbar_2_text" />
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text" />
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text" />
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text" />
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text" />
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text" />
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text" />
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text" />
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text" />
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_2_text" />
</LinearLayout>
@@ -85,7 +85,7 @@
android:background="#00FF00"
android:paddingRight="12dip">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scrollbar_3_text"
android:textColor="#000000"
@@ -98,7 +98,7 @@
android:layout_height="120dip"
android:background="@android:drawable/edit_text">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#000000"
android:text="@string/scrollbar_3_text" />
@@ -106,7 +106,7 @@
</LinearLayout>
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<ScrollView
android:id="@+id/view4"
@@ -115,7 +115,7 @@
android:scrollbarStyle="outsideOverlay"
android:background="@android:drawable/edit_text">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#000000"
android:text="@string/scrollbar_3_text" />
@@ -127,7 +127,7 @@
android:scrollbarStyle="outsideInset"
android:background="@android:drawable/edit_text">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#000000"
android:text="@string/scrollbar_3_text" />
diff --git a/samples/ApiDemos/res/layout/search_invoke.xml b/samples/ApiDemos/res/layout/search_invoke.xml
index b78a616..66bf2e8 100644
--- a/samples/ApiDemos/res/layout/search_invoke.xml
+++ b/samples/ApiDemos/res/layout/search_invoke.xml
@@ -17,13 +17,13 @@
<!-- This activity exercises search invocation options -->
<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">
<!-- Section: Information -->
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="4dip"
android:text="@string/msg_search" />
@@ -40,7 +40,7 @@
android:layout_height="wrap_content"/>
<Spinner android:id="@+id/spinner_menu_mode"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawSelectorOnTop="true" />
@@ -50,12 +50,12 @@
android:layout_height="wrap_content"
android:text="@string/search_sect_options" />
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal">
@@ -72,11 +72,11 @@
</LinearLayout>
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal">
diff --git a/samples/ApiDemos/res/layout/search_query_results.xml b/samples/ApiDemos/res/layout/search_query_results.xml
index 03f1ae6..cd92f2d 100644
--- a/samples/ApiDemos/res/layout/search_query_results.xml
+++ b/samples/ApiDemos/res/layout/search_query_results.xml
@@ -17,20 +17,20 @@
<!-- This activity displays search queries and "results" -->
<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">
<!-- Section: Information -->
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="4dip"
android:text="@string/msg_search_results" />
<!-- Section: Search Query String -->
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
@@ -45,7 +45,7 @@
<!-- Section: Search Query application context data -->
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
@@ -60,7 +60,7 @@
<!-- Section: How the query was delivered -->
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
diff --git a/samples/ApiDemos/res/layout/seekbar_1.xml b/samples/ApiDemos/res/layout/seekbar_1.xml
index 513114e..d3140b2 100644
--- a/samples/ApiDemos/res/layout/seekbar_1.xml
+++ b/samples/ApiDemos/res/layout/seekbar_1.xml
@@ -16,21 +16,21 @@
<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">
<SeekBar android:id="@+id/seek"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:max="100"
android:progress="50"
android:secondaryProgress="75" />
<TextView android:id="@+id/progress"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView android:id="@+id/tracking"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/select_dialog.xml b/samples/ApiDemos/res/layout/select_dialog.xml
index ad826af..dbf9fb7 100644
--- a/samples/ApiDemos/res/layout/select_dialog.xml
+++ b/samples/ApiDemos/res/layout/select_dialog.xml
@@ -18,12 +18,12 @@
See corresponding Java code com.android.sdk.app.SelectDialogSamples.java. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/screen"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_width="match_parent" android:layout_height="match_parent"
android:orientation="vertical">
<Button android:id="@+id/show_dialog"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:text="@string/select_dialog_show"/>
<TextView android:id="@+id/message"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/send_result.xml b/samples/ApiDemos/res/layout/send_result.xml
index 386c3fc..34b3693 100644
--- a/samples/ApiDemos/res/layout/send_result.xml
+++ b/samples/ApiDemos/res/layout/send_result.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="8dip"
android:text="@string/pick_result"/>
diff --git a/samples/ApiDemos/res/layout/service_start_arguments_controller.xml b/samples/ApiDemos/res/layout/service_start_arguments_controller.xml
index 19b7498..556dffc 100644
--- a/samples/ApiDemos/res/layout/service_start_arguments_controller.xml
+++ b/samples/ApiDemos/res/layout/service_start_arguments_controller.xml
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingBottom="4dip"
android:text="@string/service_start_arguments_controller"/>
diff --git a/samples/ApiDemos/res/layout/shape_drawable_1.xml b/samples/ApiDemos/res/layout/shape_drawable_1.xml
index 037e844..b0ad479 100644
--- a/samples/ApiDemos/res/layout/shape_drawable_1.xml
+++ b/samples/ApiDemos/res/layout/shape_drawable_1.xml
@@ -17,56 +17,56 @@
<!-- Demonstrates scrolling with a ScrollView. -->
<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:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="50dip"
android:src="@drawable/shape_1" />
<ImageView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/line" />
<ImageView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="50dip"
android:src="@drawable/shape_2" />
<ImageView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/line" />
<ImageView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="50dip"
android:src="@drawable/shape_3" />
<ImageView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/line" />
<ImageView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="50dip"
android:src="@drawable/shape_4" />
<ImageView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/line" />
<ImageView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="50dip"
android:src="@drawable/shape_5" />
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/spinner_1.xml b/samples/ApiDemos/res/layout/spinner_1.xml
index 3d5f3c1..b7166f3 100644
--- a/samples/ApiDemos/res/layout/spinner_1.xml
+++ b/samples/ApiDemos/res/layout/spinner_1.xml
@@ -17,31 +17,31 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:padding="10dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/spinner_1_color"
/>
<Spinner android:id="@+id/spinner1"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawSelectorOnTop="true"
android:prompt="@string/spinner_1_color_prompt"
/>
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
android:text="@string/spinner_1_planet"
/>
<Spinner android:id="@+id/spinner2"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawSelectorOnTop="true"
android:prompt="@string/spinner_1_planet_prompt"
diff --git a/samples/ApiDemos/res/layout/status_bar_notifications.xml b/samples/ApiDemos/res/layout/status_bar_notifications.xml
index 11f3c96..0a291bc 100644
--- a/samples/ApiDemos/res/layout/status_bar_notifications.xml
+++ b/samples/ApiDemos/res/layout/status_bar_notifications.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
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -30,7 +30,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
@@ -61,7 +61,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
@@ -92,7 +92,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
@@ -123,7 +123,7 @@
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
diff --git a/samples/ApiDemos/res/layout/styled_text.xml b/samples/ApiDemos/res/layout/styled_text.xml
index 610ea64..a8975de 100644
--- a/samples/ApiDemos/res/layout/styled_text.xml
+++ b/samples/ApiDemos/res/layout/styled_text.xml
@@ -18,32 +18,32 @@
See corresponding Java code com.android.sdk.content.StyledText -->
<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">
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/styled_text_rsrc"/>
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textStyle="normal"
android:text="@string/styled_text"/>
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:gravity="center_horizontal"
/>
<TextView
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/styled_text_prog"/>
<TextView android:id="@+id/text"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textStyle="normal"/>
diff --git a/samples/ApiDemos/res/layout/surface_view_overlay.xml b/samples/ApiDemos/res/layout/surface_view_overlay.xml
index a557e22..dcb9824 100644
--- a/samples/ApiDemos/res/layout/surface_view_overlay.xml
+++ b/samples/ApiDemos/res/layout/surface_view_overlay.xml
@@ -18,27 +18,27 @@
<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">
<!-- Here is where we put the SurfaceView, in a frame so that we can
stack other views on top of it. -->
<FrameLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1">
<android.opengl.GLSurfaceView android:id="@+id/glsurfaceview"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent" />
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
<LinearLayout android:id="@+id/hidecontainer"
android:orientation="vertical"
android:visibility="gone"
android:background="@drawable/translucent_background"
android:gravity="center"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<Button android:id="@+id/hideme1"
android:layout_width="wrap_content"
diff --git a/samples/ApiDemos/res/layout/table_layout_1.xml b/samples/ApiDemos/res/layout/table_layout_1.xml
index 8d95e82..24609c4 100644
--- a/samples/ApiDemos/res/layout/table_layout_1.xml
+++ b/samples/ApiDemos/res/layout/table_layout_1.xml
@@ -15,8 +15,8 @@
-->
<TableLayout 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">
<TableRow>
<TextView
diff --git a/samples/ApiDemos/res/layout/table_layout_10.xml b/samples/ApiDemos/res/layout/table_layout_10.xml
index 6c558e7..75573a0 100644
--- a/samples/ApiDemos/res/layout/table_layout_10.xml
+++ b/samples/ApiDemos/res/layout/table_layout_10.xml
@@ -15,8 +15,8 @@
-->
<TableLayout 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:stretchColumns="1">
<TableRow>
diff --git a/samples/ApiDemos/res/layout/table_layout_11.xml b/samples/ApiDemos/res/layout/table_layout_11.xml
index e40e28a..638b712 100644
--- a/samples/ApiDemos/res/layout/table_layout_11.xml
+++ b/samples/ApiDemos/res/layout/table_layout_11.xml
@@ -15,7 +15,7 @@
-->
<TableLayout 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:stretchColumns="1">
diff --git a/samples/ApiDemos/res/layout/table_layout_12.xml b/samples/ApiDemos/res/layout/table_layout_12.xml
index 423e34e..17c63ae 100644
--- a/samples/ApiDemos/res/layout/table_layout_12.xml
+++ b/samples/ApiDemos/res/layout/table_layout_12.xml
@@ -15,7 +15,7 @@
-->
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TableRow>
diff --git a/samples/ApiDemos/res/layout/table_layout_2.xml b/samples/ApiDemos/res/layout/table_layout_2.xml
index c5134d3..f7cd206 100644
--- a/samples/ApiDemos/res/layout/table_layout_2.xml
+++ b/samples/ApiDemos/res/layout/table_layout_2.xml
@@ -15,8 +15,8 @@
-->
<TableLayout 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">
<TableRow>
<Button
diff --git a/samples/ApiDemos/res/layout/table_layout_3.xml b/samples/ApiDemos/res/layout/table_layout_3.xml
index 44415fc..691f824 100644
--- a/samples/ApiDemos/res/layout/table_layout_3.xml
+++ b/samples/ApiDemos/res/layout/table_layout_3.xml
@@ -15,8 +15,8 @@
-->
<TableLayout 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:shrinkColumns="2, 3">
<!-- Rows have different number of columns and content doesn't fit on
diff --git a/samples/ApiDemos/res/layout/table_layout_4.xml b/samples/ApiDemos/res/layout/table_layout_4.xml
index a9b7b42..3b50bec 100644
--- a/samples/ApiDemos/res/layout/table_layout_4.xml
+++ b/samples/ApiDemos/res/layout/table_layout_4.xml
@@ -16,8 +16,8 @@
<!-- Stretch some columns -->
<TableLayout 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:stretchColumns="1">
<TableRow>
diff --git a/samples/ApiDemos/res/layout/table_layout_5.xml b/samples/ApiDemos/res/layout/table_layout_5.xml
index 773d729..b618129 100644
--- a/samples/ApiDemos/res/layout/table_layout_5.xml
+++ b/samples/ApiDemos/res/layout/table_layout_5.xml
@@ -16,8 +16,8 @@
<!-- Stretch some columns -->
<TableLayout 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:stretchColumns="1">
<TableRow>
diff --git a/samples/ApiDemos/res/layout/table_layout_6.xml b/samples/ApiDemos/res/layout/table_layout_6.xml
index 9607f1c..cbb6d8d 100644
--- a/samples/ApiDemos/res/layout/table_layout_6.xml
+++ b/samples/ApiDemos/res/layout/table_layout_6.xml
@@ -16,8 +16,8 @@
<!-- Stretch some columns -->
<TableLayout 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:stretchColumns="1">
<TableRow>
diff --git a/samples/ApiDemos/res/layout/table_layout_7.xml b/samples/ApiDemos/res/layout/table_layout_7.xml
index 88c4910..ae8ba1f 100644
--- a/samples/ApiDemos/res/layout/table_layout_7.xml
+++ b/samples/ApiDemos/res/layout/table_layout_7.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_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<TableLayout
android:id="@+id/menu"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stretchColumns="1"
android:collapseColumns="2">
diff --git a/samples/ApiDemos/res/layout/table_layout_8.xml b/samples/ApiDemos/res/layout/table_layout_8.xml
index a63a8e8..0871432 100644
--- a/samples/ApiDemos/res/layout/table_layout_8.xml
+++ b/samples/ApiDemos/res/layout/table_layout_8.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_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<TableLayout
android:id="@+id/menu"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TableRow>
diff --git a/samples/ApiDemos/res/layout/table_layout_9.xml b/samples/ApiDemos/res/layout/table_layout_9.xml
index a2d6564..edb4029 100644
--- a/samples/ApiDemos/res/layout/table_layout_9.xml
+++ b/samples/ApiDemos/res/layout/table_layout_9.xml
@@ -15,15 +15,15 @@
-->
<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:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<TableLayout
android:id="@+id/menu"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TableRow>
diff --git a/samples/ApiDemos/res/layout/tabs1.xml b/samples/ApiDemos/res/layout/tabs1.xml
index 5a17693..603fe82 100644
--- a/samples/ApiDemos/res/layout/tabs1.xml
+++ b/samples/ApiDemos/res/layout/tabs1.xml
@@ -15,25 +15,25 @@
-->
<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">
<TextView android:id="@+id/view1"
android:background="@drawable/blue"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:text="@string/tabs_1_tab_1"/>
<TextView android:id="@+id/view2"
android:background="@drawable/red"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:text="@string/tabs_1_tab_2"/>
<TextView android:id="@+id/view3"
android:background="@drawable/green"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:text="@string/tabs_1_tab_3"/>
</FrameLayout>
diff --git a/samples/ApiDemos/res/layout/text_switcher_1.xml b/samples/ApiDemos/res/layout/text_switcher_1.xml
index d7be743..00ae307 100644
--- a/samples/ApiDemos/res/layout/text_switcher_1.xml
+++ b/samples/ApiDemos/res/layout/text_switcher_1.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">
<Button android:id="@+id/next"
@@ -25,7 +25,7 @@
android:text="@string/text_switcher_1_next_text" />
<TextSwitcher android:id="@+id/switcher"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/text_to_speech.xml b/samples/ApiDemos/res/layout/text_to_speech.xml
index 0ba60e1..48295df 100644
--- a/samples/ApiDemos/res/layout/text_to_speech.xml
+++ b/samples/ApiDemos/res/layout/text_to_speech.xml
@@ -15,8 +15,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"
>
<Button android:id="@+id/again_button"
android:layout_width="wrap_content"
diff --git a/samples/ApiDemos/res/layout/translucent_background.xml b/samples/ApiDemos/res/layout/translucent_background.xml
index 6b6e1cf..c4a1acf 100644
--- a/samples/ApiDemos/res/layout/translucent_background.xml
+++ b/samples/ApiDemos/res/layout/translucent_background.xml
@@ -19,6 +19,6 @@
<!-- This screen consists of a single text field that displays some text. -->
<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_width="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical|center_horizontal"
android:text="@string/translucent_background"/>
diff --git a/samples/ApiDemos/res/layout/videoview.xml b/samples/ApiDemos/res/layout/videoview.xml
index 4f35ace..db97a11 100644
--- a/samples/ApiDemos/res/layout/videoview.xml
+++ b/samples/ApiDemos/res/layout/videoview.xml
@@ -1,8 +1,8 @@
<?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"
>
<VideoView
diff --git a/samples/ApiDemos/res/layout/visibility_1.xml b/samples/ApiDemos/res/layout/visibility_1.xml
index ad94602..1027772 100644
--- a/samples/ApiDemos/res/layout/visibility_1.xml
+++ b/samples/ApiDemos/res/layout/visibility_1.xml
@@ -18,30 +18,30 @@
<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">
<LinearLayout
android:orientation="vertical"
android:background="@drawable/box"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:background="@drawable/red"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/visibility_1_view_1"/>
<TextView android:id="@+id/victim"
android:background="@drawable/green"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/visibility_1_view_2"/>
<TextView
android:background="@drawable/blue"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/visibility_1_view_3"/>
diff --git a/samples/ApiDemos/res/layout/voice_recognition.xml b/samples/ApiDemos/res/layout/voice_recognition.xml
index 2db4a72..66175ed 100644
--- a/samples/ApiDemos/res/layout/voice_recognition.xml
+++ b/samples/ApiDemos/res/layout/voice_recognition.xml
@@ -18,23 +18,23 @@
<!-- This activity displays UI for launching voice recognition -->
<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">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="4dip"
android:text="@string/voice_recognition_prompt" />
<Button android:id="@+id/btn_speak"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/speak_button" />
<ListView android:id="@+id/list"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1" />
diff --git a/samples/ApiDemos/res/layout/wallpaper_2.xml b/samples/ApiDemos/res/layout/wallpaper_2.xml
index 85161c9..324d749 100644
--- a/samples/ApiDemos/res/layout/wallpaper_2.xml
+++ b/samples/ApiDemos/res/layout/wallpaper_2.xml
@@ -10,7 +10,7 @@
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content"
- android:layout_height="fill_parent">
+ android:layout_height="match_parent">
<Button
android:id="@+id/randomize"
android:layout_width="wrap_content"
diff --git a/samples/ApiDemos/res/layout/webview_1.xml b/samples/ApiDemos/res/layout/webview_1.xml
index 91fca39..67cea3a 100644
--- a/samples/ApiDemos/res/layout/webview_1.xml
+++ b/samples/ApiDemos/res/layout/webview_1.xml
@@ -15,64 +15,64 @@
-->
<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"
android:orientation="vertical">
<LinearLayout
android:orientation="vertical"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<WebView android:id="@+id/wv1"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
/>
<WebView android:id="@+id/wv2"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
/>
<WebView android:id="@+id/wv3"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
/>
<WebView android:id="@+id/wv4"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
/>
<WebView android:id="@+id/wv5"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
/>
<WebView android:id="@+id/wv6"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
/>
<WebView android:id="@+id/wv7"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
/>
<WebView android:id="@+id/wv8"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
/>
<WebView android:id="@+id/wv9"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
/>
<WebView android:id="@+id/wv10"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
/>
</LinearLayout>
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/LaunchingPreferences.java b/samples/ApiDemos/src/com/example/android/apis/app/LaunchingPreferences.java
index aa151fe..4aa1522 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/LaunchingPreferences.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/LaunchingPreferences.java
@@ -28,7 +28,6 @@
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.TextView;
-import android.widget.Toast;
import android.widget.LinearLayout.LayoutParams;
/**
@@ -63,11 +62,11 @@
Button launchPreferences = new Button(this);
launchPreferences.setText(getString(R.string.launch_preference_activity));
launchPreferences.setOnClickListener(this);
- layout.addView(launchPreferences, new LayoutParams(LayoutParams.FILL_PARENT,
+ layout.addView(launchPreferences, new LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.WRAP_CONTENT));
mCounterText = new TextView(this);
- layout.addView(mCounterText, new LayoutParams(LayoutParams.FILL_PARENT,
+ layout.addView(mCounterText, new LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.WRAP_CONTENT));
updateCounterText();
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/MenuInflateFromXml.java b/samples/ApiDemos/src/com/example/android/apis/app/MenuInflateFromXml.java
index f51b3b8..fc7b62a 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/MenuInflateFromXml.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/MenuInflateFromXml.java
@@ -19,14 +19,11 @@
import com.example.android.apis.R;
import android.app.Activity;
-import android.app.NotificationManager;
-import android.content.Context;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.ArrayAdapter;
-import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.Spinner;
import android.widget.TextView;
@@ -93,7 +90,7 @@
// Add the spinner
layout.addView(mSpinner,
new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.FILL_PARENT,
+ LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.WRAP_CONTENT));
// Create help text
@@ -103,7 +100,7 @@
// Add the help, make it look decent
LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.FILL_PARENT,
+ LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.WRAP_CONTENT);
lp.setMargins(10, 10, 10, 10);
layout.addView(mInstructionsText, lp);
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/DensityActivity.java b/samples/ApiDemos/src/com/example/android/apis/graphics/DensityActivity.java
index 10c42a7..8c5c93a 100644
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/DensityActivity.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/DensityActivity.java
@@ -21,7 +21,6 @@
import com.example.android.apis.R;
import android.app.Activity;
-import android.app.Application;
import android.os.Bundle;
import android.graphics.BitmapFactory;
import android.graphics.Bitmap;
@@ -34,8 +33,6 @@
import android.view.LayoutInflater;
import android.view.View;
import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
import android.util.DisplayMetrics;
import android.util.Log;
@@ -117,20 +114,20 @@
private View scrollWrap(View view) {
ScrollView scroller = new ScrollView(this);
- scroller.addView(view, new ScrollView.LayoutParams(ScrollView.LayoutParams.FILL_PARENT,
- ScrollView.LayoutParams.FILL_PARENT));
+ scroller.addView(view, new ScrollView.LayoutParams(ScrollView.LayoutParams.MATCH_PARENT,
+ ScrollView.LayoutParams.MATCH_PARENT));
return scroller;
}
private void addLabelToRoot(LinearLayout root, String text) {
TextView label = new TextView(this);
label.setText(text);
- root.addView(label, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT,
+ root.addView(label, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.WRAP_CONTENT));
}
private void addChildToRoot(LinearLayout root, LinearLayout layout) {
- root.addView(layout, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT,
+ root.addView(layout, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.WRAP_CONTENT));
}
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/PictureLayout.java b/samples/ApiDemos/src/com/example/android/apis/graphics/PictureLayout.java
index 9bdb49a..cfa3c29 100644
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/PictureLayout.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/PictureLayout.java
@@ -76,7 +76,7 @@
@Override
protected LayoutParams generateDefaultLayoutParams() {
- return new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
+ return new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
}
@Override
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/ExpandableList1.java b/samples/ApiDemos/src/com/example/android/apis/view/ExpandableList1.java
index 944db64..bda366b 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/ExpandableList1.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/ExpandableList1.java
@@ -24,7 +24,6 @@
import android.view.View;
import android.view.ViewGroup;
import android.view.ContextMenu.ContextMenuInfo;
-import android.view.ViewGroup.MarginLayoutParams;
import android.widget.AbsListView;
import android.widget.BaseExpandableListAdapter;
import android.widget.ExpandableListAdapter;
@@ -112,7 +111,7 @@
public TextView getGenericView() {
// Layout parameters for the ExpandableListView
AbsListView.LayoutParams lp = new AbsListView.LayoutParams(
- ViewGroup.LayoutParams.FILL_PARENT, 64);
+ ViewGroup.LayoutParams.MATCH_PARENT, 64);
TextView textView = new TextView(ExpandableList1.this);
textView.setLayoutParams(lp);
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/ImageSwitcher1.java b/samples/ApiDemos/src/com/example/android/apis/view/ImageSwitcher1.java
index f72b623..66ef282 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/ImageSwitcher1.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/ImageSwitcher1.java
@@ -67,8 +67,8 @@
ImageView i = new ImageView(this);
i.setBackgroundColor(0xFF000000);
i.setScaleType(ImageView.ScaleType.FIT_CENTER);
- i.setLayoutParams(new ImageSwitcher.LayoutParams(LayoutParams.FILL_PARENT,
- LayoutParams.FILL_PARENT));
+ i.setLayoutParams(new ImageSwitcher.LayoutParams(LayoutParams.MATCH_PARENT,
+ LayoutParams.MATCH_PARENT));
return i;
}
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/InternalSelectionFocus.java b/samples/ApiDemos/src/com/example/android/apis/view/InternalSelectionFocus.java
index a664ab9..876af8d 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/InternalSelectionFocus.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/InternalSelectionFocus.java
@@ -46,11 +46,11 @@
final LinearLayout layout = new LinearLayout(this);
layout.setOrientation(LinearLayout.HORIZONTAL);
layout.setLayoutParams(new ViewGroup.LayoutParams(
- ViewGroup.LayoutParams.FILL_PARENT,
- ViewGroup.LayoutParams.FILL_PARENT));
+ ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT));
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0,
- ViewGroup.LayoutParams.FILL_PARENT, 1);
+ ViewGroup.LayoutParams.MATCH_PARENT, 1);
final InternalSelectionView leftColumn = new InternalSelectionView(this, 5, "left column");
leftColumn.setLayoutParams(params);
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/InternalSelectionScroll.java b/samples/ApiDemos/src/com/example/android/apis/view/InternalSelectionScroll.java
index fe607e2..987eaed 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/InternalSelectionScroll.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/InternalSelectionScroll.java
@@ -44,7 +44,7 @@
ScrollView sv = new ScrollView(this);
ViewGroup.LayoutParams svLp = new ScrollView.LayoutParams(
- ViewGroup.LayoutParams.FILL_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT);
LinearLayout ll = new LinearLayout(this);
@@ -54,7 +54,7 @@
InternalSelectionView isv = new InternalSelectionView(this, 10);
int screenHeight = getWindowManager().getDefaultDisplay().getHeight();
LinearLayout.LayoutParams llLp = new LinearLayout.LayoutParams(
- ViewGroup.LayoutParams.FILL_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT,
2 * screenHeight); // 2x screen height to ensure scrolling
isv.setLayoutParams(llLp);
ll.addView(isv);
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout7.java b/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout7.java
index 32c787f..a7edf2e 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout7.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/LinearLayout7.java
@@ -25,7 +25,7 @@
/**
- * Demonstrates using fill_parent within a linear layout whose size is not fixed.
+ * Demonstrates using match_parent within a linear layout whose size is not fixed.
*
*/
public class LinearLayout7 extends Activity {
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/List4.java b/samples/ApiDemos/src/com/example/android/apis/view/List4.java
index 2bd589d..a140e60 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/List4.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/List4.java
@@ -346,12 +346,12 @@
mTitle = new TextView(context);
mTitle.setText(title);
addView(mTitle, new LinearLayout.LayoutParams(
- LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
+ LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
mDialogue = new TextView(context);
mDialogue.setText(words);
addView(mDialogue, new LinearLayout.LayoutParams(
- LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
+ LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
}
/**
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/List6.java b/samples/ApiDemos/src/com/example/android/apis/view/List6.java
index 9bb5b14..2d4536f 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/List6.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/List6.java
@@ -374,11 +374,11 @@
mTitle = new TextView(context);
mTitle.setText(title);
- addView(mTitle, new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
+ addView(mTitle, new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
mDialogue = new TextView(context);
mDialogue.setText(dialogue);
- addView(mDialogue, new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
+ addView(mDialogue, new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
mDialogue.setVisibility(expanded ? VISIBLE : GONE);
}
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/ScrollView2.java b/samples/ApiDemos/src/com/example/android/apis/view/ScrollView2.java
index 89e4003..1af3c81 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/ScrollView2.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/ScrollView2.java
@@ -20,7 +20,6 @@
import android.app.Activity;
import android.os.Bundle;
-import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Button;
@@ -41,7 +40,7 @@
TextView textView = new TextView(this);
textView.setText("Text View " + i);
LinearLayout.LayoutParams p = new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.FILL_PARENT,
+ LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.WRAP_CONTENT
);
layout.addView(textView, p);
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/_index.html b/samples/ApiDemos/src/com/example/android/apis/view/_index.html
index 1561729..a462bc1 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/_index.html
+++ b/samples/ApiDemos/src/com/example/android/apis/view/_index.html
@@ -13,7 +13,7 @@
<dd>Demonstrates a simple LinearLayout, with child width set to WRAP_CONTENT. </dd>
<dt><a href="LinearLayout2.html">2. Vertical (Fill Screen)</a></dt>
- <dd>Demonstrates a simple LinearLayout, with child width set to FILL_PARENT.</dd>
+ <dd>Demonstrates a simple LinearLayout, with child width set to MATCH_PARENT.</dd>
<dt><a href="LinearLayout3.html">3. Vertical (Padded)</a></dt>
<dd>Demonstrates a LinearLayout where one of the elements can expand to fill any remaining screen space (weight=1). </dd>
@@ -25,7 +25,7 @@
<dd>Demonstrates nested layouts to create a user form.</dd>
<dt><a href="LinearLayout6.html">6. Uniform Size</a></dt>
- <dd>LinearLayout which uses a combination of wrap_content on itself and fill_parent on its children to get every item to be the same width.</dd>
+ <dd>LinearLayout which uses a combination of wrap_content on itself and match_parent on its children to get every item to be the same width.</dd>
<dt><a href="LinearLayout7.html">7. Fill Parent</a></dt>
<dd>Demonstrates a horizontal linear layout with equally sized columns. Some columns force their height to match the parent.</dd>
diff --git a/samples/BluetoothChat/res/layout/custom_title.xml b/samples/BluetoothChat/res/layout/custom_title.xml
index 6b7dca5..57eb6b4 100644
--- a/samples/BluetoothChat/res/layout/custom_title.xml
+++ b/samples/BluetoothChat/res/layout/custom_title.xml
@@ -14,8 +14,8 @@
limitations under the License.
-->
<RelativeLayout 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:gravity="center_vertical"
>
<TextView android:id="@+id/title_left_text"
@@ -24,7 +24,7 @@
android:singleLine="true"
style="?android:attr/windowTitleStyle"
android:layout_width="wrap_content"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_weight="1"
/>
<TextView android:id="@+id/title_right_text"
@@ -32,7 +32,7 @@
android:ellipsize="end"
android:singleLine="true"
android:layout_width="wrap_content"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:textColor="#fff"
android:layout_weight="1"
/>
diff --git a/samples/BluetoothChat/res/layout/device_list.xml b/samples/BluetoothChat/res/layout/device_list.xml
index e7b84b9..395695f 100644
--- a/samples/BluetoothChat/res/layout/device_list.xml
+++ b/samples/BluetoothChat/res/layout/device_list.xml
@@ -15,11 +15,11 @@
-->
<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:id="@+id/title_paired_devices"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/title_paired_devices"
android:visibility="gone"
@@ -28,13 +28,13 @@
android:paddingLeft="5dp"
/>
<ListView android:id="@+id/paired_devices"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stackFromBottom="true"
android:layout_weight="1"
/>
<TextView android:id="@+id/title_new_devices"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/title_other_devices"
android:visibility="gone"
@@ -43,13 +43,13 @@
android:paddingLeft="5dp"
/>
<ListView android:id="@+id/new_devices"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stackFromBottom="true"
android:layout_weight="2"
/>
<Button android:id="@+id/button_scan"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/button_scan"
/>
diff --git a/samples/BluetoothChat/res/layout/device_name.xml b/samples/BluetoothChat/res/layout/device_name.xml
index c693f3a..8fa358c 100644
--- a/samples/BluetoothChat/res/layout/device_name.xml
+++ b/samples/BluetoothChat/res/layout/device_name.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<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:textSize="18sp"
android:padding="5dp"
diff --git a/samples/BluetoothChat/res/layout/main.xml b/samples/BluetoothChat/res/layout/main.xml
index 307f5a5..17025f6 100644
--- a/samples/BluetoothChat/res/layout/main.xml
+++ b/samples/BluetoothChat/res/layout/main.xml
@@ -16,19 +16,19 @@
<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/in"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:stackFromBottom="true"
android:transcriptMode="alwaysScroll"
android:layout_weight="1"
/>
<LinearLayout
android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<EditText android:id="@+id/edit_text_out"
diff --git a/samples/BluetoothChat/res/layout/message.xml b/samples/BluetoothChat/res/layout/message.xml
index c693f3a..8fa358c 100644
--- a/samples/BluetoothChat/res/layout/message.xml
+++ b/samples/BluetoothChat/res/layout/message.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<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:textSize="18sp"
android:padding="5dp"
diff --git a/samples/BrowserPlugin/src/com/android/sampleplugin/SamplePlugin.java b/samples/BrowserPlugin/src/com/android/sampleplugin/SamplePlugin.java
index 2cfb525..ec09d0f 100644
--- a/samples/BrowserPlugin/src/com/android/sampleplugin/SamplePlugin.java
+++ b/samples/BrowserPlugin/src/com/android/sampleplugin/SamplePlugin.java
@@ -38,8 +38,6 @@
import android.webkit.plugin.NativePlugin;
import android.webkit.plugin.SurfaceDrawingModel;
import android.widget.FrameLayout;
-import android.widget.MediaController;
-import android.widget.VideoView;
public class SamplePlugin implements NativePlugin {
@@ -152,15 +150,15 @@
*/
FrameLayout layout = new FrameLayout(context);
- LayoutParams fp = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
+ LayoutParams fp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
layout.setLayoutParams(fp);
// VideoView video = new VideoView(context);
-// LayoutParams vp = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
+// LayoutParams vp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
// layout.setLayoutParams(vp);
GLSurfaceView gl = new GLSurfaceView(context);
- LayoutParams gp = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
+ LayoutParams gp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
layout.setLayoutParams(gp);
layout.addView(gl);
diff --git a/samples/BusinessCard/res/layout/business_card.xml b/samples/BusinessCard/res/layout/business_card.xml
index c7ce713..ffb18d4 100644
--- a/samples/BusinessCard/res/layout/business_card.xml
+++ b/samples/BusinessCard/res/layout/business_card.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
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">
<Button
android:id="@+id/pick_contact_button"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_margin="10dip"
diff --git a/samples/ContactManager/res/layout/account_entry.xml b/samples/ContactManager/res/layout/account_entry.xml
index 435e737..9a4e197 100644
--- a/samples/ContactManager/res/layout/account_entry.xml
+++ b/samples/ContactManager/res/layout/account_entry.xml
@@ -15,19 +15,19 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:padding="6dip">
<ImageView
android:id="@+id/accountIcon"
android:layout_width="wrap_content"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="6dip" />
<TextView
android:id="@+id/secondAccountLine"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="26dip"
android:layout_toRightOf="@id/accountIcon"
android:layout_alignParentBottom="true"
@@ -37,7 +37,7 @@
android:textColor="@android:color/secondary_text_light" />
<TextView
android:id="@+id/firstAccountLine"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/accountIcon"
android:layout_alignParentRight="true"
diff --git a/samples/ContactManager/res/layout/contact_adder.xml b/samples/ContactManager/res/layout/contact_adder.xml
index 92d06f3..8fb7277 100644
--- a/samples/ContactManager/res/layout/contact_adder.xml
+++ b/samples/ContactManager/res/layout/contact_adder.xml
@@ -15,10 +15,10 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
- <TableLayout android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <TableLayout android:layout_width="match_parent"
+ android:layout_height="match_parent">
<TableRow>
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
</TableRow>
<TableRow>
<Spinner android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_weight="1"
android:id="@+id/accountSpinner"/>
</TableRow>
@@ -73,7 +73,7 @@
<Button android:layout_height="wrap_content"
android:text="@string/save"
android:id="@+id/contactSaveButton"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_weight="1"/>
</TableRow>
</TableLayout>
diff --git a/samples/ContactManager/res/layout/contact_entry.xml b/samples/ContactManager/res/layout/contact_entry.xml
index 9909025..6193db5 100644
--- a/samples/ContactManager/res/layout/contact_entry.xml
+++ b/samples/ContactManager/res/layout/contact_entry.xml
@@ -19,6 +19,6 @@
android:layout_height="wrap_content">
<TextView android:text="@+id/contactEntryText"
android:id="@+id/contactEntryText"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
diff --git a/samples/ContactManager/res/layout/contact_manager.xml b/samples/ContactManager/res/layout/contact_manager.xml
index 73f6f81..8fe18c5 100644
--- a/samples/ContactManager/res/layout/contact_manager.xml
+++ b/samples/ContactManager/res/layout/contact_manager.xml
@@ -16,9 +16,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
- <ListView android:layout_width="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <ListView android:layout_width="match_parent"
android:id="@+id/contactList"
android:layout_height="wrap_content"
android:layout_weight="1"/>
@@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:id="@+id/showInvisible"
android:text="@string/showInvisible"/>
- <Button android:layout_width="fill_parent"
+ <Button android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/addContactButton"
android:text="@string/addContactButtonLabel"/>
diff --git a/samples/FixedGridLayout/res/layout/main.xml b/samples/FixedGridLayout/res/layout/main.xml
index 93e2d5e..c6bc52a 100644
--- a/samples/FixedGridLayout/res/layout/main.xml
+++ b/samples/FixedGridLayout/res/layout/main.xml
@@ -3,8 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res/com.example.android.fixedgridlayout"
android:id="@+id/grid"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
app:cellWidth="80dp"
app:cellHeight="100dp"
>
diff --git a/samples/GlobalTime/res/layout/global_time.xml b/samples/GlobalTime/res/layout/global_time.xml
index 237207f..6bb3c79 100644
--- a/samples/GlobalTime/res/layout/global_time.xml
+++ b/samples/GlobalTime/res/layout/global_time.xml
@@ -15,7 +15,7 @@
-->
<EditText xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:layout_width="match_parent" android:layout_height="match_parent"
android:textSize="18sp"
android:text="@string/global_time_text_text" />
diff --git a/samples/HelloActivity/res/layout/hello_activity.xml b/samples/HelloActivity/res/layout/hello_activity.xml
index 2a4d2de..bab9c9c 100644
--- a/samples/HelloActivity/res/layout/hello_activity.xml
+++ b/samples/HelloActivity/res/layout/hello_activity.xml
@@ -15,8 +15,8 @@
-->
<EditText xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:textSize="18sp"
android:autoText="true"
android:capitalize="sentences"
diff --git a/samples/Home/res/layout-land/home.xml b/samples/Home/res/layout-land/home.xml
index d723c69..8eecbdb 100644
--- a/samples/Home/res/layout-land/home.xml
+++ b/samples/Home/res/layout-land/home.xml
@@ -17,8 +17,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:home="http://schemas.android.com/apk/res/com.example.android.home"
android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<!-- All applications on the top side of the screen -->
<GridView android:id="@+id/all_apps"
@@ -33,7 +33,7 @@
android:stretchMode="spacingWidth"
android:layout_weight="1.0"
android:layout_height="0dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:stackFromBottom="true"
android:visibility="invisible" />
@@ -43,7 +43,7 @@
home:marginLeft="1dip"
home:marginRight="1dip"
android:layout_marginTop="0dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="65dip"
android:background="@drawable/application_background" />
diff --git a/samples/Home/res/layout-port/home.xml b/samples/Home/res/layout-port/home.xml
index d723c69..8eecbdb 100644
--- a/samples/Home/res/layout-port/home.xml
+++ b/samples/Home/res/layout-port/home.xml
@@ -17,8 +17,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:home="http://schemas.android.com/apk/res/com.example.android.home"
android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<!-- All applications on the top side of the screen -->
<GridView android:id="@+id/all_apps"
@@ -33,7 +33,7 @@
android:stretchMode="spacingWidth"
android:layout_weight="1.0"
android:layout_height="0dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:stackFromBottom="true"
android:visibility="invisible" />
@@ -43,7 +43,7 @@
home:marginLeft="1dip"
home:marginRight="1dip"
android:layout_marginTop="0dip"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="65dip"
android:background="@drawable/application_background" />
diff --git a/samples/Home/res/layout/all_applications_button.xml b/samples/Home/res/layout/all_applications_button.xml
index 88430b3..bed98dd 100644
--- a/samples/Home/res/layout/all_applications_button.xml
+++ b/samples/Home/res/layout/all_applications_button.xml
@@ -28,7 +28,7 @@
android:id="@+id/show_all_apps_check"
android:focusable="false"
android:clickable="false"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/all_applications_background"
android:button="@drawable/all_applications"
diff --git a/samples/Home/res/layout/wallpaper.xml b/samples/Home/res/layout/wallpaper.xml
index 92dc65e..76f5af7 100644
--- a/samples/Home/res/layout/wallpaper.xml
+++ b/samples/Home/res/layout/wallpaper.xml
@@ -19,8 +19,8 @@
-->
<RelativeLayout 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">
<TextView
android:layout_width="wrap_content"
@@ -34,7 +34,7 @@
<Gallery android:id="@+id/gallery"
android:background="#70000000"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="60dip"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
diff --git a/samples/JetBoy/res/layout/main.xml b/samples/JetBoy/res/layout/main.xml
index ea2277f..b1154ad 100755
--- a/samples/JetBoy/res/layout/main.xml
+++ b/samples/JetBoy/res/layout/main.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
<com.example.android.jetboy.JetBoyView android:id="@+id/JetBoyView"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent" />
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
<TextView android:id="@+id/text" android:text="@string/helpText"
style="@style/helpText" android:visibility="invisible"
diff --git a/samples/LunarLander/res/layout/lunar_layout.xml b/samples/LunarLander/res/layout/lunar_layout.xml
index 9ad0536..f1a8990 100644
--- a/samples/LunarLander/res/layout/lunar_layout.xml
+++ b/samples/LunarLander/res/layout/lunar_layout.xml
@@ -15,17 +15,17 @@
-->
<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">
<com.example.android.lunarlander.LunarView
android:id="@+id/lunar"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"/>
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
<RelativeLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent" >
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
<TextView
android:id="@+id/text"
android:text="@string/lunar_layout_text_text"
diff --git a/samples/MultiResolution/res/layout-land/main.xml b/samples/MultiResolution/res/layout-land/main.xml
index f704425..515349f 100644
--- a/samples/MultiResolution/res/layout-land/main.xml
+++ b/samples/MultiResolution/res/layout-land/main.xml
@@ -16,28 +16,28 @@
<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/background">
<LinearLayout
android:layout_weight="1"
android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<!-- Notice that widget sizes are expressed in dip, or device-independent
pixels, while text sizes are expressed in sp, or scale-independent
pixels, to factor in user-chosen font sizes. -->
<FrameLayout
android:background="@drawable/image_container"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:id="@+id/image_container">
<ImageView
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:id="@+id/image_view"
android:scaleType="fitCenter"/>
<TextView
@@ -57,7 +57,7 @@
<LinearLayout
android:layout_width="wrap_content"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:orientation="vertical"
android:layout_marginLeft="10dip"
android:gravity="top">
diff --git a/samples/MultiResolution/res/layout/main.xml b/samples/MultiResolution/res/layout/main.xml
index 4c01e82..9910849 100644
--- a/samples/MultiResolution/res/layout/main.xml
+++ b/samples/MultiResolution/res/layout/main.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"
android:background="@drawable/background">
<LinearLayout
android:layout_weight="1"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<!-- Notice that widget sizes are expressed in dip, or device-independent
pixels, while text sizes are expressed in sp, or scale-independent
pixels, to factor in user-chosen font sizes. -->
<FrameLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:id="@+id/image_container"
android:background="@drawable/image_container">
<ImageView
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:id="@+id/image_view"
android:scaleType="fitCenter"/>
<TextView
@@ -55,7 +55,7 @@
</LinearLayout>
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
android:gravity="center">
diff --git a/samples/MySampleRss/res/layout/add_item.xml b/samples/MySampleRss/res/layout/add_item.xml
index 8191bf5..826082d 100644
--- a/samples/MySampleRss/res/layout/add_item.xml
+++ b/samples/MySampleRss/res/layout/add_item.xml
@@ -15,8 +15,8 @@
-->
<RelativeLayout 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/title_label"
android:layout_height="wrap_content"
@@ -26,11 +26,11 @@
android:text="@string/add_item_title"/>
<EditText android:id="@+id/title_textbox"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_toRightOf="@id/title_label"/>
<EditText android:id="@+id/url_textbox"
android:layout_height="wrap_content"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_below="@id/title_textbox"
android:layout_alignLeft="@id/title_textbox"/>
diff --git a/samples/MySampleRss/res/layout/main_screen.xml b/samples/MySampleRss/res/layout/main_screen.xml
index 5292bb2..3cae487 100755
--- a/samples/MySampleRss/res/layout/main_screen.xml
+++ b/samples/MySampleRss/res/layout/main_screen.xml
@@ -15,21 +15,21 @@
-->
<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"
android:scrollbars="vertical">
<ListView android:id="@+id/rssListView"
android:layout_height="0px"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_weight="1"
android:background="#00CC00"/>
<WebView android:id="@+id/rssWebView"
android:background="#77CC0000"
android:layout_height="0px"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_weight="1"/>
</LinearLayout>
diff --git a/samples/MySampleRss/res/layout/main_screen2.xml b/samples/MySampleRss/res/layout/main_screen2.xml
index 36b0af4..826e5bc 100644
--- a/samples/MySampleRss/res/layout/main_screen2.xml
+++ b/samples/MySampleRss/res/layout/main_screen2.xml
@@ -15,19 +15,19 @@
-->
<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"
android:scrollbars="vertical">
<ListView android:id="@+id/rssListView"
android:layout_height="0px"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_weight="1"
android:background="#9900FF00"/>
<WebView android:id="@+id/rssWebView"
android:layout_height="0px"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_weight="2"/>
</LinearLayout>
diff --git a/samples/NotePad/res/layout/note_editor.xml b/samples/NotePad/res/layout/note_editor.xml
index c54a963..d7da99e 100644
--- a/samples/NotePad/res/layout/note_editor.xml
+++ b/samples/NotePad/res/layout/note_editor.xml
@@ -17,8 +17,8 @@
<view xmlns:android="http://schemas.android.com/apk/res/android"
class="com.example.android.notepad.NoteEditor$LinedEditText"
android:id="@+id/note"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:background="@android:color/transparent"
android:padding="5dip"
android:scrollbars="vertical"
diff --git a/samples/NotePad/res/layout/noteslist_item.xml b/samples/NotePad/res/layout/noteslist_item.xml
index b167734..e11c5ee 100644
--- a/samples/NotePad/res/layout/noteslist_item.xml
+++ b/samples/NotePad/res/layout/noteslist_item.xml
@@ -16,7 +16,7 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center_vertical"
diff --git a/samples/RSSReader/res/layout/rss_layout.xml b/samples/RSSReader/res/layout/rss_layout.xml
index 842f4f7..838656a 100644
--- a/samples/RSSReader/res/layout/rss_layout.xml
+++ b/samples/RSSReader/res/layout/rss_layout.xml
@@ -15,13 +15,13 @@
-->
<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:padding="10dip"
android:orientation="vertical">
<EditText android:id="@+id/urltext"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="12sp"
android:autoText="false"
@@ -34,7 +34,7 @@
android:text="@string/rss_layout_download_text" />
<TextView android:id="@+id/statustext"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autoText="false"
android:capitalize="none"
@@ -42,7 +42,7 @@
android:text="@string/rss_layout_statustext_text" />
<ListView android:id="@android:id/list"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:drawSelectorOnTop="false"/>
diff --git a/samples/SearchableDictionary/res/layout/main.xml b/samples/SearchableDictionary/res/layout/main.xml
index d0dd522..666416d 100644
--- a/samples/SearchableDictionary/res/layout/main.xml
+++ b/samples/SearchableDictionary/res/layout/main.xml
@@ -18,18 +18,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">
<TextView
android:id="@+id/textField"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/search_instructions"/>
<ListView
android:id="@+id/list"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"/>
</LinearLayout>
diff --git a/samples/SearchableDictionary/res/layout/word.xml b/samples/SearchableDictionary/res/layout/word.xml
index ba1a3da..21a5ed4 100644
--- a/samples/SearchableDictionary/res/layout/word.xml
+++ b/samples/SearchableDictionary/res/layout/word.xml
@@ -18,8 +18,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:id="@+id/word"
android:textAppearance="?android:attr/textAppearanceLarge"
@@ -32,7 +32,7 @@
<TextView
android:id="@+id/definition"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/search_instructions"
android:layout_marginLeft="10dip" />
diff --git a/samples/SkeletonApp/res/layout/skeleton_activity.xml b/samples/SkeletonApp/res/layout/skeleton_activity.xml
index b8dcac7..1aa49dd 100644
--- a/samples/SkeletonApp/res/layout/skeleton_activity.xml
+++ b/samples/SkeletonApp/res/layout/skeleton_activity.xml
@@ -22,7 +22,7 @@
a row, here set to be vertical (so the first is at the top) -->
<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">
<!-- First view is a text editor. We want it to use all available
@@ -30,7 +30,7 @@
is available to it. Note the use of the "id" attribute, which
allows us to find this object from the Java code. -->
<EditText android:id="@+id/editor"
- android:layout_width="fill_parent" android:layout_height="0dip"
+ android:layout_width="match_parent" android:layout_height="0dip"
android:autoText="true"
android:capitalize="sentences"
android:layout_weight="1"
diff --git a/samples/Snake/res/layout/snake_layout.xml b/samples/Snake/res/layout/snake_layout.xml
index 583c0c4..ef8abe3 100644
--- a/samples/Snake/res/layout/snake_layout.xml
+++ b/samples/Snake/res/layout/snake_layout.xml
@@ -15,19 +15,19 @@
-->
<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">
<com.example.android.snake.SnakeView
android:id="@+id/snake"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
tileSize="24"
/>
<RelativeLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent" >
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
<TextView
android:id="@+id/text"
diff --git a/samples/SoftKeyboard/res/layout/input.xml b/samples/SoftKeyboard/res/layout/input.xml
index 1b57468..d78a9f2 100755
--- a/samples/SoftKeyboard/res/layout/input.xml
+++ b/samples/SoftKeyboard/res/layout/input.xml
@@ -22,6 +22,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/keyboard"
android:layout_alignParentBottom="true"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
diff --git a/samples/Wiktionary/res/layout/about.xml b/samples/Wiktionary/res/layout/about.xml
index 3b25b32..7b90fd9 100644
--- a/samples/Wiktionary/res/layout/about.xml
+++ b/samples/Wiktionary/res/layout/about.xml
@@ -15,13 +15,13 @@
-->
<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:padding="20dip">
<TextView
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16sp"
android:text="@string/app_descrip"
@@ -29,7 +29,7 @@
<TextView
android:id="@+id/about_credits"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="20dip"
android:textSize="16sp"
diff --git a/samples/Wiktionary/res/layout/lookup.xml b/samples/Wiktionary/res/layout/lookup.xml
index 43cffaa..6b7e3ea 100644
--- a/samples/Wiktionary/res/layout/lookup.xml
+++ b/samples/Wiktionary/res/layout/lookup.xml
@@ -15,13 +15,13 @@
-->
<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:id="@+id/title_bar"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical">
@@ -49,7 +49,7 @@
<WebView
android:id="@+id/webview"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1" />
diff --git a/samples/Wiktionary/res/layout/widget_message.xml b/samples/Wiktionary/res/layout/widget_message.xml
index ba94714..7a675b9 100644
--- a/samples/Wiktionary/res/layout/widget_message.xml
+++ b/samples/Wiktionary/res/layout/widget_message.xml
@@ -16,14 +16,14 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/widget"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
style="@style/WidgetBackground">
<TextView
android:id="@+id/message"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dip"
android:padding="10dip"
diff --git a/samples/Wiktionary/res/layout/widget_word.xml b/samples/Wiktionary/res/layout/widget_word.xml
index 0e76f0b..4a00384 100644
--- a/samples/Wiktionary/res/layout/widget_word.xml
+++ b/samples/Wiktionary/res/layout/widget_word.xml
@@ -16,7 +16,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/widget"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
style="@style/WidgetBackground">
@@ -64,7 +64,7 @@
<TextView
android:id="@+id/definition"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/word_title"
android:layout_toRightOf="@id/bullet"
diff --git a/samples/WiktionarySimple/res/layout/widget_message.xml b/samples/WiktionarySimple/res/layout/widget_message.xml
index ba94714..7a675b9 100644
--- a/samples/WiktionarySimple/res/layout/widget_message.xml
+++ b/samples/WiktionarySimple/res/layout/widget_message.xml
@@ -16,14 +16,14 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/widget"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
style="@style/WidgetBackground">
<TextView
android:id="@+id/message"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dip"
android:padding="10dip"
diff --git a/samples/WiktionarySimple/res/layout/widget_word.xml b/samples/WiktionarySimple/res/layout/widget_word.xml
index 0e76f0b..4a00384 100644
--- a/samples/WiktionarySimple/res/layout/widget_word.xml
+++ b/samples/WiktionarySimple/res/layout/widget_word.xml
@@ -16,7 +16,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/widget"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
style="@style/WidgetBackground">
@@ -64,7 +64,7 @@
<TextView
android:id="@+id/definition"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/word_title"
android:layout_toRightOf="@id/bullet"
diff --git a/tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml
index b254552..4af9754 100755
--- a/tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml
+++ b/tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml
@@ -1,11 +1,11 @@
<?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:orientation="vertical" android:layout_width="match_parent"
+ android:layout_height="match_parent">
<LinearLayout android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:layout_width="wrap_content"
@@ -20,7 +20,7 @@
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/body" />
- <EditText android:id="@+id/body" android:layout_width="fill_parent"
+ <EditText android:id="@+id/body" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:scrollbars="vertical" />
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml
index b254552..4af9754 100755
--- a/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml
@@ -1,11 +1,11 @@
<?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:orientation="vertical" android:layout_width="match_parent"
+ android:layout_height="match_parent">
<LinearLayout android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:layout_width="wrap_content"
@@ -20,7 +20,7 @@
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/body" />
- <EditText android:id="@+id/body" android:layout_width="fill_parent"
+ <EditText android:id="@+id/body" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:scrollbars="vertical" />
diff --git a/tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml
index b254552..4af9754 100755
--- a/tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml
+++ b/tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml
@@ -1,11 +1,11 @@
<?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:orientation="vertical" android:layout_width="match_parent"
+ android:layout_height="match_parent">
<LinearLayout android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:layout_width="wrap_content"
@@ -20,7 +20,7 @@
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/body" />
- <EditText android:id="@+id/body" android:layout_width="fill_parent"
+ <EditText android:id="@+id/body" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:scrollbars="vertical" />
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml
index b254552..4af9754 100755
--- a/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml
@@ -1,11 +1,11 @@
<?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:orientation="vertical" android:layout_width="match_parent"
+ android:layout_height="match_parent">
<LinearLayout android:orientation="horizontal"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:layout_width="wrap_content"
@@ -20,7 +20,7 @@
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/body" />
- <EditText android:id="@+id/body" android:layout_width="fill_parent"
+ <EditText android:id="@+id/body" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:scrollbars="vertical" />
