Code drop from //branches/cupcake/...@124589

3 files changed, 30 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"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index be224560..1a093cb6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -27,6 +27,7 @@
     <string name="install_application">Install application</string>
     <string name="installing">Installing\u2026</string>
     <string name="install_done">Application installed</string>
+    <string name="install_confirm_question">Do you want to install this application?</string>
     <string name="install_failed">Application install unsuccessful</string>
     <string name="launch">Launch</string>
     <string name="unknown_apps_dlg_title">Install blocked</string>
@@ -52,4 +53,7 @@ found in the list of installed applications.</string>
     <string name="uninstall_application">Uninstall</string>
     <string name="app_security_permission_title"><xliff:g id="app_name">%1$s</xliff:g> - security permissions</string>
 
+    <!-- Dialog attributes to indicate parse errors -->
+    <string name="Parse_error_dlg_title">Parse Error</string>
+    <string name="Parse_error_dlg_text">There is a problem parsing the package.</string>
 </resources>