From 123499b4aa68cc9711fe5bfac8632b57e03eea44 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Wed, 26 Jan 2011 12:58:14 -0800
Subject: Do not clip icon on install screen

Bug: 3385827
Change-Id: Ib7014f1377ca9fc470c333541d183f7dbd394de8
---
 res/layout/app_details.xml        | 9 +++++----
 res/layout/install_confirm.xml    | 6 +++---
 res/layout/op_progress.xml        | 1 -
 res/layout/uninstall_confirm.xml  | 6 +-----
 res/layout/uninstall_progress.xml | 3 +--
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml
index 7dbd0a23..b3683700 100755
--- a/res/layout/app_details.xml
+++ b/res/layout/app_details.xml
@@ -24,7 +24,8 @@ installation screens
     android:id="@+id/app_snippet"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="12dip"
+    android:layout_marginTop="16dip"
+    android:layout_marginLeft="16dip"
     >
     <ImageView android:id="@+id/app_icon"
         android:layout_width="54dip"
@@ -33,7 +34,7 @@ installation screens
         android:layout_alignParentLeft="true"
         android:gravity="left"
         android:scaleType="centerCrop"
-        android:paddingLeft="6dip"/>
+        android:layout_marginLeft="8dip"/>
     <TextView android:id="@+id/app_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -45,8 +46,8 @@ installation screens
         android:singleLine="true"
         android:gravity="center"
         android:layout_centerInParent="true"
-        android:paddingRight="6dip"
-        android:paddingLeft="6dip"
+        android:paddingRight="16dip"
+        android:paddingLeft="16dip"
         android:ellipsize="end"/>
 </RelativeLayout>
 
diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml
index ca5dbd0d..6072579e 100755
--- a/res/layout/install_confirm.xml
+++ b/res/layout/install_confirm.xml
@@ -23,7 +23,6 @@
 
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        style="@style/padded"
         android:orientation="vertical"
         android:layout_weight="1"
         android:layout_width="match_parent"
@@ -35,8 +34,8 @@
             android:layout_height="wrap_content"
             android:text="@string/install_confirm_question"
             android:textAppearance="?android:attr/textAppearanceMedium"
+            style="@style/padded"
             android:paddingTop="16dip"
-            android:paddingLeft="16dip"
             android:paddingBottom="16dip"/>
 
     <ScrollView
@@ -50,7 +49,8 @@
                 android:id="@+id/permissions_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginRight = "2dip"
+                android:layout_marginRight="?android:attr/scrollbarSize"
+                style="@style/padded"
                 android:orientation="vertical">
             <TextView
                     android:id="@+id/security_settings_desc"
diff --git a/res/layout/op_progress.xml b/res/layout/op_progress.xml
index 3b410523..ded050c3 100755
--- a/res/layout/op_progress.xml
+++ b/res/layout/op_progress.xml
@@ -15,7 +15,6 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        style="@style/padded"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
diff --git a/res/layout/uninstall_confirm.xml b/res/layout/uninstall_confirm.xml
index 4b273964..b6b1c69b 100755
--- a/res/layout/uninstall_confirm.xml
+++ b/res/layout/uninstall_confirm.xml
@@ -23,7 +23,6 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/padded"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -33,6 +32,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:orientation="vertical"
+        style="@style/padded"
         android:paddingTop="6dip"
         android:paddingBottom="6dip">
 
@@ -44,8 +44,6 @@
             android:textColor="?android:attr/textColorSecondary"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:paddingTop="16dip"
-            android:paddingLeft="6dip"
-            android:paddingRight="6dip"
             android:visibility="gone" />
 
         <!-- The snippet (title & icon) about the application being uninstalled. -->
@@ -61,8 +59,6 @@
             android:textColor="?android:attr/textColorSecondary"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:paddingTop="16dip"
-            android:paddingLeft="6dip"
-            android:paddingRight="6dip"
             android:paddingBottom="16dip" />
 
     </LinearLayout>
diff --git a/res/layout/uninstall_progress.xml b/res/layout/uninstall_progress.xml
index 394d1fd3..e9e1ec29 100755
--- a/res/layout/uninstall_progress.xml
+++ b/res/layout/uninstall_progress.xml
@@ -15,7 +15,6 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        style="@style/padded"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -30,7 +29,7 @@
             android:layout_centerHorizontal="true"
             android:layout_centerVertical="true"
             android:paddingTop="16dip"
-            android:paddingLeft="16dip"
+            style="@style/padded"
             android:paddingBottom="16dip"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     <ProgressBar
-- 
cgit v1.2.3