Check for activity info when uninstalling.

Also, switch to using standard fat title bar.

2 files changed, 41 insertions, 33 deletions

diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml
index 82ecff34..7dbd0a23 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 7c079d92..78cd64be 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