diff options
author | Romain Guy <romainguy@android.com> | 2010-01-08 15:07:05 -0800 |
---|---|---|
committer | Romain Guy <romainguy@android.com> | 2010-01-08 15:11:55 -0800 |
commit | e40d35ee030031d04dc6f8d53af5710ae16b351e (patch) | |
tree | d2d35a2a9e9e776cc410384bdd230968e2d5080d /res | |
parent | ae84c36bc5b7cc7979790d6793efafa1cb29ab08 (diff) | |
download | packages_apps_packageinstaller-e40d35ee030031d04dc6f8d53af5710ae16b351e.zip packages_apps_packageinstaller-e40d35ee030031d04dc6f8d53af5710ae16b351e.tar.gz packages_apps_packageinstaller-e40d35ee030031d04dc6f8d53af5710ae16b351e.tar.bz2 |
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
Diffstat (limited to 'res')
-rwxr-xr-x | res/layout/app_details.xml | 2 | ||||
-rwxr-xr-x | res/layout/install_confirm.xml | 10 | ||||
-rwxr-xr-x | res/layout/install_start.xml | 4 | ||||
-rwxr-xr-x | res/layout/op_progress.xml | 14 | ||||
-rwxr-xr-x | res/layout/uninstall_confirm.xml | 8 | ||||
-rwxr-xr-x | res/layout/uninstall_progress.xml | 12 |
6 files changed, 25 insertions, 25 deletions
diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml index 3ea8430..0b04792 100755 --- a/res/layout/app_details.xml +++ b/res/layout/app_details.xml @@ -22,7 +22,7 @@ installation screens <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/app_snippet" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="65dip" android:background="@color/title_background"> <ImageView android:id="@+id/app_icon" diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml index 9634098..8039e5d 100755 --- a/res/layout/install_confirm.xml +++ b/res/layout/install_confirm.xml @@ -25,7 +25,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_weight="1" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content"> <TextView @@ -39,7 +39,7 @@ android:paddingBottom="20dip"/> <ScrollView - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:fillViewport="true" android:layout_weight="1"> @@ -47,7 +47,7 @@ <!-- Security settings description. --> <LinearLayout android:id="@+id/permissions_section" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginRight = "2dip" android:orientation="vertical"> @@ -63,7 +63,7 @@ <LinearLayout android:id="@+id/security_settings_list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1.0" android:orientation="vertical"/> @@ -73,7 +73,7 @@ <!-- OK confirm and cancel buttons. --> <LinearLayout android:background="@color/title_background" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="bottom" android:paddingTop="4dip" diff --git a/res/layout/install_start.xml b/res/layout/install_start.xml index d95daa6..8f861cc 100755 --- a/res/layout/install_start.xml +++ b/res/layout/install_start.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"> <include layout="@layout/app_details" diff --git a/res/layout/op_progress.xml b/res/layout/op_progress.xml index aaab868..03fcaf6 100755 --- a/res/layout/op_progress.xml +++ b/res/layout/op_progress.xml @@ -16,18 +16,18 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:fillViewport="true"> <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <include layout="@layout/app_details" android:id="@+id/app_snippet"/> <TextView android:id="@+id/center_text" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:layout_centerVertical="true" @@ -37,7 +37,7 @@ <ProgressBar android:id="@+id/progress_bar" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="24dip" android:paddingLeft="16dip" @@ -48,7 +48,7 @@ <LinearLayout android:id="@+id/buttons_panel" android:background="@color/title_background" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:orientation="horizontal"> diff --git a/res/layout/uninstall_confirm.xml b/res/layout/uninstall_confirm.xml index 32d3dad..e84d04a 100755 --- a/res/layout/uninstall_confirm.xml +++ b/res/layout/uninstall_confirm.xml @@ -23,8 +23,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"> <!-- The snippet about the application - title, icon, description. --> <include @@ -35,7 +35,7 @@ <!-- uninstall application confirmation question --> <TextView android:id="@+id/uninstall_question" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:textStyle="bold" android:paddingTop="16dip" @@ -57,7 +57,7 @@ <!-- OK confirm and cancel buttons. --> <LinearLayout android:background="@color/title_background" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:paddingTop="4dip" diff --git a/res/layout/uninstall_progress.xml b/res/layout/uninstall_progress.xml index d5fdd73..cd75405 100755 --- a/res/layout/uninstall_progress.xml +++ b/res/layout/uninstall_progress.xml @@ -16,13 +16,13 @@ <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" android:fillViewport="true" > <RelativeLayout android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <include layout="@layout/app_details" android:id="@+id/app_snippet"/> @@ -36,14 +36,14 @@ <ProgressBar android:id="@+id/progress_bar" style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="24dip" android:layout_below="@id/center_text" android:max="100" /> <RelativeLayout android:id="@+id/ok_panel" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/title_background" android:paddingTop="4dip" |