diff options
| author | Romain Guy <romainguy@android.com> | 2010-01-08 15:05:33 -0800 |
|---|---|---|
| committer | Romain Guy <romainguy@android.com> | 2010-01-08 15:11:18 -0800 |
| commit | 74192eafec8408417114d77784cd35eda5df573c (patch) | |
| tree | fac15940efc0fdc38b8bdc44d4c3dc6efa474aab /apps/CustomLocale | |
| parent | b4e39aebf6b27aa0ed094a75bde8b2bacda28d98 (diff) | |
| download | android_development-74192eafec8408417114d77784cd35eda5df573c.tar.gz android_development-74192eafec8408417114d77784cd35eda5df573c.tar.bz2 android_development-74192eafec8408417114d77784cd35eda5df573c.zip | |
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
Diffstat (limited to 'apps/CustomLocale')
| -rw-r--r-- | apps/CustomLocale/res/layout/list_item.xml | 6 | ||||
| -rw-r--r-- | apps/CustomLocale/res/layout/main.xml | 20 | ||||
| -rw-r--r-- | apps/CustomLocale/res/layout/new_locale.xml | 12 |
3 files changed, 19 insertions, 19 deletions
diff --git a/apps/CustomLocale/res/layout/list_item.xml b/apps/CustomLocale/res/layout/list_item.xml index 8c59f92c7..0ffb8b064 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 b1eaa51ba..55bd90cc6 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 fafb16e92..e5be408ff 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"/> |
