From 47c476d3102e15ec4c8307d424adf6c54982d5f3 Mon Sep 17 00:00:00 2001
From: Chih-Chung Chang <chihchung@google.com>
Date: Thu, 3 Nov 2011 19:25:58 +0800
Subject: [PATCH] Fix 5543077: Gallery UI tweaks.

Change-Id: I0b85b37ba851628acd0853e4de0985b494606487
---
 res/layout/action_bar_text.xml                      |  4 ++--
 res/layout/manage_offline_bar.xml                   |  6 +++++-
 res/values/dimensions.xml                           |  2 +-
 src/com/android/gallery3d/ui/ManageCacheDrawer.java | 19 +++++++++++++++----
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/res/layout/action_bar_text.xml b/res/layout/action_bar_text.xml
index ca5a9cda8..06a2ac9f0 100644
--- a/res/layout/action_bar_text.xml
+++ b/res/layout/action_bar_text.xml
@@ -20,7 +20,7 @@
     android:layout_height="wrap_content"
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:gravity="center_vertical"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+    android:paddingLeft="18dp"
+    android:paddingRight="18dp"
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
 />
diff --git a/res/layout/manage_offline_bar.xml b/res/layout/manage_offline_bar.xml
index 9d43e91f0..5c716133d 100644
--- a/res/layout/manage_offline_bar.xml
+++ b/res/layout/manage_offline_bar.xml
@@ -39,19 +39,23 @@
     </RelativeLayout>
     <RelativeLayout android:layout_width="fill_parent"
                 android:layout_height="@dimen/manage_cache_bottom_height"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:background="#1f1f1f">
         <TextView android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/make_available_offline"
+            android:textSize="14sp"
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
             android:gravity="center_vertical"
             android:drawableLeft="@drawable/ic_menu_make_offline"
             android:drawablePadding="3dp"/>
         <Button android:id="@+id/done"
-            android:layout_width="wrap_content"
+            android:layout_width="74dp"
             android:layout_height="match_parent"
             android:text="@string/done"
+            android:textSize="14sp"
             android:layout_alignParentRight="true"/>
     </RelativeLayout>
 </LinearLayout>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index adea4fc3d..39b1b730b 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -30,7 +30,7 @@
     <dimen name="albumset_title_font_size">14sp</dimen>
     <dimen name="albumset_count_font_size">12sp</dimen>
     <dimen name="albumset_left_margin">6dp</dimen>
-    <dimen name="albumset_icon_size">26dp</dimen>
+    <dimen name="albumset_icon_size">25dp</dimen>
 
     <!-- configuration for album page -->
     <integer name="album_rows_land">2</integer>
diff --git a/src/com/android/gallery3d/ui/ManageCacheDrawer.java b/src/com/android/gallery3d/ui/ManageCacheDrawer.java
index 1a94bca88..e75fe9aa7 100644
--- a/src/com/android/gallery3d/ui/ManageCacheDrawer.java
+++ b/src/com/android/gallery3d/ui/ManageCacheDrawer.java
@@ -60,11 +60,24 @@ public class ManageCacheDrawer extends IconDrawer {
             int dataSourceType, int mediaType, boolean isPanorama,
             int labelBackgroundHeight, boolean wantCache, boolean isCaching) {
 
+        boolean selected = mSelectionManager.isItemSelected(path);
+        boolean chooseToCache = wantCache ^ selected;
+        boolean available = isLocal(dataSourceType) || chooseToCache;
+
         int x = -width / 2;
         int y = -height / 2;
 
+        if (!available) {
+            canvas.save(GLCanvas.SAVE_FLAG_ALPHA);
+            canvas.multiplyAlpha(0.6f);
+        }
+
         drawWithRotation(canvas, content, x, y, width, height, rotation);
 
+        if (!available) {
+            canvas.restore();
+        }
+
         if (((rotation / 90) & 0x01) == 1) {
             int temp = width;
             width = height;
@@ -76,7 +89,7 @@ public class ManageCacheDrawer extends IconDrawer {
         drawMediaTypeOverlay(canvas, mediaType, isPanorama, x, y, width, height);
         drawLabelBackground(canvas, width, height, labelBackgroundHeight);
         drawIcon(canvas, width, height, dataSourceType);
-        drawCachingPin(canvas, path, dataSourceType, isCaching, wantCache,
+        drawCachingPin(canvas, path, dataSourceType, isCaching, chooseToCache,
                 width, height);
 
         if (mSelectionManager.isPressedPath(path)) {
@@ -85,9 +98,7 @@ public class ManageCacheDrawer extends IconDrawer {
     }
 
     private void drawCachingPin(GLCanvas canvas, Path path, int dataSourceType,
-            boolean isCaching, boolean wantCache, int width, int height) {
-        boolean selected = mSelectionManager.isItemSelected(path);
-        boolean chooseToCache = wantCache ^ selected;
+            boolean isCaching, boolean chooseToCache, int width, int height) {
 
         ResourceTexture icon = null;
         if (isLocal(dataSourceType)) {
-- 
2.11.0