diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-02 22:54:43 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-02 22:54:43 -0800 |
commit | 2fa4ad8141ed0cb686c7acab27f01e8c2bc2877a (patch) | |
tree | 59fc988de9bdfbca4bcf0b946d29bceda657fa7c /res/layout | |
parent | 9162d55f6dd35c1c4e76a27876435d17c0a5d14b (diff) | |
download | packages_apps_packageinstaller-2fa4ad8141ed0cb686c7acab27f01e8c2bc2877a.zip packages_apps_packageinstaller-2fa4ad8141ed0cb686c7acab27f01e8c2bc2877a.tar.gz packages_apps_packageinstaller-2fa4ad8141ed0cb686c7acab27f01e8c2bc2877a.tar.bz2 |
auto import from //depot/cupcake/@137055
Diffstat (limited to 'res/layout')
-rwxr-xr-x | res/layout/install_confirm.xml | 110 | ||||
-rwxr-xr-x | res/layout/uninstall_confirm.xml | 3 |
2 files changed, 58 insertions, 55 deletions
diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml index bc4fde2..bfda97d 100755 --- a/res/layout/install_confirm.xml +++ b/res/layout/install_confirm.xml @@ -21,46 +21,43 @@ user before it is installed. --> -<ScrollView +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:fillViewport="true" - android:background="@color/view_background"> + android:layout_height="fill_parent"> - <LinearLayout - android:id="@+id/all_details" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> + <include + layout="@layout/app_details" + android:id="@+id/app_snippet"/> + <TextView + android:id="@+id/install_confirm_question" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/install_confirm_question" + android:textAppearance="?android:attr/textAppearanceMedium" + android:paddingTop="20dip" + android:paddingLeft="20dip" + android:paddingBottom="20dip"/> - <include - layout="@layout/app_details" - android:id="@+id/app_snippet"/> - <TextView - android:id="@+id/install_confirm_question" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1.0" - android:text="@string/install_confirm_question" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="?android:attr/textColorSecondary" - android:paddingTop="20dip" - android:paddingLeft="20dip" - android:paddingBottom="20dip"/> + <ScrollView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:fillViewport="true" + android:layout_weight="1"> <!-- Security settings description. --> <LinearLayout android:id="@+id/permissions_section" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_marginRight = "2dip" android:orientation="vertical"> <TextView android:id="@+id/security_settings_desc" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="?android:attr/textColorSecondary" android:paddingTop="20dip" android:paddingLeft="20dip" android:paddingBottom="20dip"/> @@ -72,37 +69,40 @@ android:layout_weight="1.0" android:orientation="vertical"/> </LinearLayout> + </ScrollView> - <!-- OK confirm and cancel buttons. --> - <LinearLayout - android:background="@color/title_background" - android:layout_width="fill_parent" + <!-- OK confirm and cancel buttons. --> + <LinearLayout + android:background="@color/title_background" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="bottom" + android:paddingTop="4dip" + android:paddingLeft="2dip" + android:paddingRight="2dip" + android:orientation="horizontal"> + <Button + android:id="@+id/ok_button" + android:text="@string/install" + android:layout_width="150dip" + android:paddingLeft="6dip" + android:layout_gravity="left" + android:layout_weight="0.4" + android:layout_height="wrap_content"/> + <!-- Spacer --> + <View + android:id="@+id/buttons_spacer_left" + android:layout_width="0dip" android:layout_height="wrap_content" - android:gravity="bottom" - android:orientation="horizontal"> - <Button - android:id="@+id/ok_button" - android:text="@string/install" - android:layout_width="150dip" - android:paddingLeft="6dip" - android:layout_gravity="left" - android:layout_weight="0.4" - android:layout_height="wrap_content"/> - <!-- Spacer --> - <View - android:id="@+id/buttons_spacer_left" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:visibility="gone" - android:layout_weight="0.2" /> - <Button - android:id="@+id/cancel_button" - android:layout_width="150dip" - android:paddingRight="6dip" - android:layout_gravity="right" - android:text="@string/cancel" - android:layout_weight="0.4" - android:layout_height="wrap_content"/> - </LinearLayout> + android:visibility="gone" + android:layout_weight="0.2" /> + <Button + android:id="@+id/cancel_button" + android:layout_width="150dip" + android:paddingRight="6dip" + android:layout_gravity="right" + android:text="@string/cancel" + android:layout_weight="0.4" + android:layout_height="wrap_content"/> </LinearLayout> -</ScrollView> +</LinearLayout> diff --git a/res/layout/uninstall_confirm.xml b/res/layout/uninstall_confirm.xml index 62bd154..3f7f18a 100755 --- a/res/layout/uninstall_confirm.xml +++ b/res/layout/uninstall_confirm.xml @@ -63,6 +63,9 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" + android:paddingTop="4dip" + android:paddingLeft="2dip" + android:paddingRight="2dip" android:orientation="horizontal"> <Button android:id="@+id/ok_button" |