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

1 files changed, 87 insertions, 45 deletions

diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index c9c00a7..6ca92d2 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -62,13 +62,7 @@
 
         <TextView
             style="?android:attr/listSeparatorTextViewStyle"
-            android:text="@string/storage_label"
-            android:background="@*android:drawable/settings_header" 
-            android:textSize="18sp"
-            android:paddingTop="6dip" 
-            android:paddingLeft="6dip" 
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content" />
+            android:text="@string/storage_label" />
 
         <LinearLayout
             android:layout_width="fill_parent"
@@ -84,8 +78,7 @@
                 <TextView
                     android:id="@+id/total_size_prefix"
                     android:text="@string/total_size_label"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:textSize="18sp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1"
@@ -105,10 +98,9 @@
                     android:scaleType="center" />
                 <TextView
                     android:id="@+id/total_size_text"
-                    android:textSize="18sp"
                     android:paddingTop="6dip"
                     android:paddingRight="6dip"
-                    android:textColor="?android:attr/textColorPrimary"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
@@ -123,8 +115,7 @@
                 <TextView
                     android:id="@+id/application_size_prefix"
                     android:text="@string/application_size_label"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:textSize="18sp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1"
@@ -143,10 +134,9 @@
                     android:scaleType="center" />
                 <TextView
                     android:id="@+id/application_size_text"
-                    android:textSize="18sp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
                     android:paddingRight="6dip"
-                    android:textColor="?android:attr/textColorPrimary"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
@@ -162,8 +152,7 @@
                 <TextView
                     android:id="@+id/data_size_prefix"
                     android:text="@string/data_size_label"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:textSize="18sp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1"
@@ -182,10 +171,9 @@
                     android:scaleType="center" />
                 <TextView
                     android:id="@+id/data_size_text"
-                    android:textSize="18sp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
                     android:paddingRight="6dip"
-                    android:textColor="?android:attr/textColorPrimary"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
@@ -223,20 +211,73 @@
                     android:layout_height="wrap_content"/>
             </LinearLayout>
         </LinearLayout>
+
+        <!-- Clear cache section -->
+        <RelativeLayout
+            android:id="@+id/cache_panel"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" >
+            <TextView
+                android:id="@+id/cache_header"
+                style="?android:attr/listSeparatorTextViewStyle"
+                android:text="@string/cache_header_label" />
+            <LinearLayout
+                android:id="@+id/cache_size"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:baselineAligned="true"
+                android:layout_below="@id/cache_header"
+                android:paddingTop="-1dip">
+                <TextView
+                    android:text="@string/cache_size_label"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:paddingTop="6dip"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="6dip"/>
+                <ImageView
+                    android:src="@drawable/dotted_line_480px"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:layout_height="1px"
+                    android:layout_gravity="bottom"
+                    android:layout_marginLeft="1dip"
+                    android:layout_marginRight="1dip"
+                    android:layout_marginBottom="4dip"
+                    android:scaleType="center" />
+                <TextView
+                    android:id="@+id/cache_size_text"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:paddingTop="6dip"
+                    android:paddingRight="6dip"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1" />
+            </LinearLayout>
+
+            <Button android:id="@+id/clear_cache_button"
+                android:layout_alignParentRight="true"
+                android:layout_below="@id/cache_size"
+                android:layout_centerHorizontal="true"
+                android:layout_width="150dip"
+                android:text="@string/clear_cache_btn_text"
+                android:layout_height="wrap_content" />
+        </RelativeLayout>
+
+        <!-- Prefered activities section -->
         <TextView
             style="?android:attr/listSeparatorTextViewStyle"
-            android:text="@string/auto_launch_label"
-            android:background="@*android:drawable/settings_header"
-            android:paddingTop="6dip"
-            android:paddingLeft="6dip"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content" />
+            android:text="@string/auto_launch_label" />
 
         <RelativeLayout 
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical">
             <TextView android:id="@+id/auto_launch"
+                android:textAppearance="?android:attr/textAppearanceSmall"
                 android:layout_alignParentLeft="true"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
@@ -251,29 +292,30 @@
                 android:text="@string/clear_activities"
                  android:layout_height="wrap_content" />
         </RelativeLayout>
+
         <!-- Permissions section -->
-        <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
-            android:text="@string/permissions_label"
-            android:background="@*android:drawable/settings_header"
-            android:textSize="18sp"
-            android:paddingTop="6dip"
-            android:paddingLeft="6dip"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content" />
-        <TextView
-            android:text="@string/security_settings_desc"
-            android:textSize="14sp"
-            android:paddingTop="6dip"
-            android:paddingLeft="6dip"
-            android:paddingBottom="6dip"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content" />
-         <LinearLayout
-            android:id="@+id/security_settings_list"
+        <LinearLayout
+            android:id="@+id/permissions_section"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:orientation="vertical"/>
+            android:orientation="vertical">
+            <TextView
+                style="?android:attr/listSeparatorTextViewStyle"
+                android:text="@string/permissions_label" />
+            <TextView
+                android:text="@string/security_settings_desc"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:paddingTop="6dip"
+                android:paddingLeft="6dip"
+                android:paddingBottom="6dip"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" />
+            <LinearLayout
+                android:id="@+id/security_settings_list"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:orientation="vertical"/>
+        </LinearLayout>
     </LinearLayout>
 </ScrollView>