diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:06:00 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:06:00 -0800 |
| commit | 092149c8a75237c476a917d57c48f8b8cd51f0f0 (patch) | |
| tree | 43bd01dcf05cefc4b0a8334ba7571c35f53341f2 /res/layout | |
| parent | 088073e6787fca4bfc68d6b04a5e887a03faf745 (diff) | |
| download | android_packages_apps_PackageInstaller-092149c8a75237c476a917d57c48f8b8cd51f0f0.tar.gz android_packages_apps_PackageInstaller-092149c8a75237c476a917d57c48f8b8cd51f0f0.tar.bz2 android_packages_apps_PackageInstaller-092149c8a75237c476a917d57c48f8b8cd51f0f0.zip | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'res/layout')
| -rwxr-xr-x | res/layout/install_confirm.xml | 31 | ||||
| -rwxr-xr-x | res/layout/install_done.xml | 2 |
2 files changed, 26 insertions, 7 deletions
diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml index 97bd364e..bc4fde2a 100755 --- a/res/layout/install_confirm.xml +++ b/res/layout/install_confirm.xml @@ -25,6 +25,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:fillViewport="true" android:background="@color/view_background"> <LinearLayout @@ -36,22 +37,41 @@ <include layout="@layout/app_details" android:id="@+id/app_snippet"/> - <!-- Security settings description. --> <TextView - android:id="@+id/security_settings_desc" + 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"/> + <!-- Security settings description. --> <LinearLayout - android:id="@+id/security_settings_list" + android:id="@+id/permissions_section" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"/> + android:layout_height="wrap_content" + 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"/> + + <LinearLayout + android:id="@+id/security_settings_list" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_weight="1.0" + android:orientation="vertical"/> + </LinearLayout> <!-- OK confirm and cancel buttons. --> <LinearLayout @@ -86,4 +106,3 @@ </LinearLayout> </LinearLayout> </ScrollView> - diff --git a/res/layout/install_done.xml b/res/layout/install_done.xml index 0031beb7..e33f57b7 100755 --- a/res/layout/install_done.xml +++ b/res/layout/install_done.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:paddingLeft="20dip" android:paddingTop="36dip" - android:drawableLeft="@drawable/button_indicator_finish" + android:drawablePadding="6dip" android:layout_below="@id/app_snippet" android:textColor="?android:attr/textColorSecondary" android:textAppearance="?android:attr/textAppearanceMedium"/> |