diff options
author | Patrick Dubroy <dubroy@google.com> | 2010-09-02 18:33:09 -0700 |
---|---|---|
committer | Patrick Dubroy <dubroy@google.com> | 2010-09-03 15:25:52 -0700 |
commit | 362660b35aec989137b205ce8cb8eb945c19c1a3 (patch) | |
tree | b4396186d44b505424fc3b06717295c50eccefba /res/layout | |
parent | a379e13559be314fa9021638e5721df13a2f4ffb (diff) | |
download | packages_apps_packageinstaller-362660b35aec989137b205ce8cb8eb945c19c1a3.zip packages_apps_packageinstaller-362660b35aec989137b205ce8cb8eb945c19c1a3.tar.gz packages_apps_packageinstaller-362660b35aec989137b205ce8cb8eb945c19c1a3.tar.bz2 |
Check for activity info when uninstalling.
Also, switch to using standard fat title bar.
Diffstat (limited to 'res/layout')
-rwxr-xr-x | res/layout/app_details.xml | 15 | ||||
-rwxr-xr-x | res/layout/uninstall_confirm.xml | 59 |
2 files changed, 41 insertions, 33 deletions
diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml index 82ecff3..7dbd0a2 100755 --- a/res/layout/app_details.xml +++ b/res/layout/app_details.xml @@ -23,18 +23,17 @@ installation screens xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/app_snippet" android:layout_width="match_parent" - android:layout_height="65dip" - android:background="@drawable/title_bar_medium" -> + android:layout_height="wrap_content" + android:layout_marginTop="12dip" + > <ImageView android:id="@+id/app_icon" - android:paddingLeft="6dip" android:layout_width="54dip" - android:layout_height="48dip" + android:layout_height="54dip" android:background="@color/transparent" android:layout_alignParentLeft="true" - android:gravity="center" - android:layout_centerInParent="true" - android:scaleType="centerCrop" /> + android:gravity="left" + android:scaleType="centerCrop" + android:paddingLeft="6dip"/> <TextView android:id="@+id/app_name" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout/uninstall_confirm.xml b/res/layout/uninstall_confirm.xml index 7c079d9..78cd64b 100755 --- a/res/layout/uninstall_confirm.xml +++ b/res/layout/uninstall_confirm.xml @@ -26,34 +26,43 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <!-- The snippet about the application - title, icon, description. --> - <include - layout="@layout/app_details" + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_alignParentTop="true" - android:id="@+id/app_snippet" /> + android:orientation="vertical" + android:paddingTop="6dip" + android:paddingBottom="6dip"> - <!-- uninstall application confirmation question --> - <TextView - android:id="@+id/uninstall_question" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textStyle="bold" - android:paddingTop="16dip" - android:paddingLeft="16dip" - android:layout_below="@id/app_snippet" - android:textColor="?android:attr/textColorSecondary" - android:textAppearance="?android:attr/textAppearanceMedium" - android:paddingBottom="36dip"/> + <!-- If an activity was specified, explains what package it's in. --> + <TextView + android:id="@+id/activity_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="?android:attr/textColorSecondary" + android:textAppearance="?android:attr/textAppearanceMedium" + android:paddingTop="16dip" + android:paddingLeft="6dip" + android:paddingRight="6dip" + android:visibility="gone" /> - <!-- uninstall application confirmation text --> - <TextView - android:id="@+id/uninstall_confirm_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="?android:attr/textColorSecondary" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_below="@id/uninstall_question" - android:paddingLeft="16dip"/> + <!-- The snippet (title & icon) about the application being uninstalled. --> + <include + layout="@layout/app_details" + android:id="@+id/uninstall_activity_snippet" /> + + <!-- uninstall application confirmation text --> + <TextView + android:id="@+id/uninstall_confirm" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="?android:attr/textColorSecondary" + android:textAppearance="?android:attr/textAppearanceMedium" + android:paddingTop="16dip" + android:paddingLeft="6dip" + android:paddingRight="6dip" /> + + </LinearLayout> <!-- OK confirm and cancel buttons. --> <LinearLayout |