From 710db7746bf13003f869a2ceef1943e8ac1aea20 Mon Sep 17 00:00:00 2001
From: Chih-Chung Chang <chihchung@google.com>
Date: Mon, 19 Sep 2011 11:09:39 +0800
Subject: Fix 5299746: New UI layout, part 2.

- Replace various icons and add xhdpi/sw600dp-mdpi versions of them.
- When user press on the thumbnails, show a color overlay on it.
- For a wide (w/h > 2) picture, add panorama overlay on it.
- Align photo count label position when there is no icon for it.
- Adjust offline page layout.

Change-Id: I327d25806e99843bfa05d3ca0e9be5a8f9375595
---
 res/drawable-hdpi/frame_overlay_gallery_ptp.png    | Bin 0 -> 1236 bytes
 res/drawable-hdpi/grid_pressed.9.png               | Bin 0 -> 233 bytes
 res/drawable-hdpi/ic_album_overlay_ptp_holo.png    | Bin 2335 -> 0 bytes
 res/drawable-hdpi/ic_gallery_play.png              | Bin 4092 -> 4071 bytes
 res/drawable-hdpi/manage_bar.9.png                 | Bin 700 -> 0 bytes
 res/drawable-mdpi/frame_overlay_gallery_ptp.png    | Bin 0 -> 878 bytes
 res/drawable-mdpi/grid_pressed.9.png               | Bin 0 -> 211 bytes
 res/drawable-mdpi/ic_album_overlay_ptp_holo.png    | Bin 2394 -> 0 bytes
 res/drawable-mdpi/ic_gallery_play.png              | Bin 2636 -> 2713 bytes
 res/drawable-mdpi/manage_bar.9.png                 | Bin 529 -> 0 bytes
 res/drawable-sw600dp-mdpi/ic_pan_thumb.png         | Bin 0 -> 621 bytes
 res/drawable-sw600dp-mdpi/ic_video_thumb.png       | Bin 0 -> 812 bytes
 .../frame_overlay_gallery_camera.png               | Bin 0 -> 1406 bytes
 .../frame_overlay_gallery_folder.png               | Bin 0 -> 1083 bytes
 .../frame_overlay_gallery_picasa.png               | Bin 0 -> 2269 bytes
 res/drawable-xhdpi/frame_overlay_gallery_ptp.png   | Bin 0 -> 1711 bytes
 res/drawable-xhdpi/grid_pressed.9.png              | Bin 0 -> 250 bytes
 res/drawable-xhdpi/grid_selected.9.png             | Bin 0 -> 250 bytes
 res/drawable-xhdpi/ic_gallery_play.png             | Bin 0 -> 5610 bytes
 res/drawable-xhdpi/ic_menu_make_offline.png        | Bin 0 -> 1172 bytes
 res/drawable-xhdpi/ic_pan_thumb.png                | Bin 0 -> 715 bytes
 res/drawable-xhdpi/ic_video_thumb.png              | Bin 0 -> 902 bytes
 res/drawable-xhdpi/thumb_selected.png              | Bin 0 -> 440 bytes
 res/layout-w480dp/manage_offline_bar.xml           |  57 --------------
 res/layout/manage_offline_bar.xml                  |  86 ++++++++++-----------
 res/values-land/dimensions.xml                     |  19 +++++
 res/values/dimensions.xml                          |   8 +-
 27 files changed, 64 insertions(+), 106 deletions(-)
 create mode 100644 res/drawable-hdpi/frame_overlay_gallery_ptp.png
 create mode 100644 res/drawable-hdpi/grid_pressed.9.png
 delete mode 100644 res/drawable-hdpi/ic_album_overlay_ptp_holo.png
 delete mode 100644 res/drawable-hdpi/manage_bar.9.png
 create mode 100644 res/drawable-mdpi/frame_overlay_gallery_ptp.png
 create mode 100644 res/drawable-mdpi/grid_pressed.9.png
 delete mode 100644 res/drawable-mdpi/ic_album_overlay_ptp_holo.png
 delete mode 100644 res/drawable-mdpi/manage_bar.9.png
 create mode 100644 res/drawable-sw600dp-mdpi/ic_pan_thumb.png
 create mode 100644 res/drawable-sw600dp-mdpi/ic_video_thumb.png
 create mode 100644 res/drawable-xhdpi/frame_overlay_gallery_camera.png
 create mode 100644 res/drawable-xhdpi/frame_overlay_gallery_folder.png
 create mode 100644 res/drawable-xhdpi/frame_overlay_gallery_picasa.png
 create mode 100644 res/drawable-xhdpi/frame_overlay_gallery_ptp.png
 create mode 100644 res/drawable-xhdpi/grid_pressed.9.png
 create mode 100644 res/drawable-xhdpi/grid_selected.9.png
 create mode 100644 res/drawable-xhdpi/ic_gallery_play.png
 create mode 100644 res/drawable-xhdpi/ic_menu_make_offline.png
 create mode 100644 res/drawable-xhdpi/ic_pan_thumb.png
 create mode 100644 res/drawable-xhdpi/ic_video_thumb.png
 create mode 100644 res/drawable-xhdpi/thumb_selected.png
 delete mode 100644 res/layout-w480dp/manage_offline_bar.xml
 create mode 100644 res/values-land/dimensions.xml

(limited to 'res')

diff --git a/res/drawable-hdpi/frame_overlay_gallery_ptp.png b/res/drawable-hdpi/frame_overlay_gallery_ptp.png
new file mode 100644
index 000000000..cb9ef501c
Binary files /dev/null and b/res/drawable-hdpi/frame_overlay_gallery_ptp.png differ
diff --git a/res/drawable-hdpi/grid_pressed.9.png b/res/drawable-hdpi/grid_pressed.9.png
new file mode 100644
index 000000000..36486ae76
Binary files /dev/null and b/res/drawable-hdpi/grid_pressed.9.png differ
diff --git a/res/drawable-hdpi/ic_album_overlay_ptp_holo.png b/res/drawable-hdpi/ic_album_overlay_ptp_holo.png
deleted file mode 100644
index b72584048..000000000
Binary files a/res/drawable-hdpi/ic_album_overlay_ptp_holo.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_gallery_play.png b/res/drawable-hdpi/ic_gallery_play.png
index e475e1fc0..e4060e5a7 100644
Binary files a/res/drawable-hdpi/ic_gallery_play.png and b/res/drawable-hdpi/ic_gallery_play.png differ
diff --git a/res/drawable-hdpi/manage_bar.9.png b/res/drawable-hdpi/manage_bar.9.png
deleted file mode 100644
index 336c2d74d..000000000
Binary files a/res/drawable-hdpi/manage_bar.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/frame_overlay_gallery_ptp.png b/res/drawable-mdpi/frame_overlay_gallery_ptp.png
new file mode 100644
index 000000000..95ba8f031
Binary files /dev/null and b/res/drawable-mdpi/frame_overlay_gallery_ptp.png differ
diff --git a/res/drawable-mdpi/grid_pressed.9.png b/res/drawable-mdpi/grid_pressed.9.png
new file mode 100644
index 000000000..ecb51bde4
Binary files /dev/null and b/res/drawable-mdpi/grid_pressed.9.png differ
diff --git a/res/drawable-mdpi/ic_album_overlay_ptp_holo.png b/res/drawable-mdpi/ic_album_overlay_ptp_holo.png
deleted file mode 100644
index adbd3d143..000000000
Binary files a/res/drawable-mdpi/ic_album_overlay_ptp_holo.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_gallery_play.png b/res/drawable-mdpi/ic_gallery_play.png
index 183d75e9a..753231d4a 100644
Binary files a/res/drawable-mdpi/ic_gallery_play.png and b/res/drawable-mdpi/ic_gallery_play.png differ
diff --git a/res/drawable-mdpi/manage_bar.9.png b/res/drawable-mdpi/manage_bar.9.png
deleted file mode 100644
index e42b92bd3..000000000
Binary files a/res/drawable-mdpi/manage_bar.9.png and /dev/null differ
diff --git a/res/drawable-sw600dp-mdpi/ic_pan_thumb.png b/res/drawable-sw600dp-mdpi/ic_pan_thumb.png
new file mode 100644
index 000000000..e249029a0
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/ic_pan_thumb.png differ
diff --git a/res/drawable-sw600dp-mdpi/ic_video_thumb.png b/res/drawable-sw600dp-mdpi/ic_video_thumb.png
new file mode 100644
index 000000000..743cec2bd
Binary files /dev/null and b/res/drawable-sw600dp-mdpi/ic_video_thumb.png differ
diff --git a/res/drawable-xhdpi/frame_overlay_gallery_camera.png b/res/drawable-xhdpi/frame_overlay_gallery_camera.png
new file mode 100644
index 000000000..e9bc7ccbc
Binary files /dev/null and b/res/drawable-xhdpi/frame_overlay_gallery_camera.png differ
diff --git a/res/drawable-xhdpi/frame_overlay_gallery_folder.png b/res/drawable-xhdpi/frame_overlay_gallery_folder.png
new file mode 100644
index 000000000..cbafc8549
Binary files /dev/null and b/res/drawable-xhdpi/frame_overlay_gallery_folder.png differ
diff --git a/res/drawable-xhdpi/frame_overlay_gallery_picasa.png b/res/drawable-xhdpi/frame_overlay_gallery_picasa.png
new file mode 100644
index 000000000..e7463a432
Binary files /dev/null and b/res/drawable-xhdpi/frame_overlay_gallery_picasa.png differ
diff --git a/res/drawable-xhdpi/frame_overlay_gallery_ptp.png b/res/drawable-xhdpi/frame_overlay_gallery_ptp.png
new file mode 100644
index 000000000..57fb7e486
Binary files /dev/null and b/res/drawable-xhdpi/frame_overlay_gallery_ptp.png differ
diff --git a/res/drawable-xhdpi/grid_pressed.9.png b/res/drawable-xhdpi/grid_pressed.9.png
new file mode 100644
index 000000000..f2fed2da5
Binary files /dev/null and b/res/drawable-xhdpi/grid_pressed.9.png differ
diff --git a/res/drawable-xhdpi/grid_selected.9.png b/res/drawable-xhdpi/grid_selected.9.png
new file mode 100644
index 000000000..d0f4a22f3
Binary files /dev/null and b/res/drawable-xhdpi/grid_selected.9.png differ
diff --git a/res/drawable-xhdpi/ic_gallery_play.png b/res/drawable-xhdpi/ic_gallery_play.png
new file mode 100644
index 000000000..70901e59b
Binary files /dev/null and b/res/drawable-xhdpi/ic_gallery_play.png differ
diff --git a/res/drawable-xhdpi/ic_menu_make_offline.png b/res/drawable-xhdpi/ic_menu_make_offline.png
new file mode 100644
index 000000000..808e2d1da
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_make_offline.png differ
diff --git a/res/drawable-xhdpi/ic_pan_thumb.png b/res/drawable-xhdpi/ic_pan_thumb.png
new file mode 100644
index 000000000..6e3405c0d
Binary files /dev/null and b/res/drawable-xhdpi/ic_pan_thumb.png differ
diff --git a/res/drawable-xhdpi/ic_video_thumb.png b/res/drawable-xhdpi/ic_video_thumb.png
new file mode 100644
index 000000000..e0f53b381
Binary files /dev/null and b/res/drawable-xhdpi/ic_video_thumb.png differ
diff --git a/res/drawable-xhdpi/thumb_selected.png b/res/drawable-xhdpi/thumb_selected.png
new file mode 100644
index 000000000..c6536bcf4
Binary files /dev/null and b/res/drawable-xhdpi/thumb_selected.png differ
diff --git a/res/layout-w480dp/manage_offline_bar.xml b/res/layout-w480dp/manage_offline_bar.xml
deleted file mode 100644
index d44ecf09f..000000000
--- a/res/layout-w480dp/manage_offline_bar.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:background="@drawable/manage_bar">
-    <LinearLayout android:id="@+id/cache_bar"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-        <TextView android:layout_width="wrap_content"
-                android:paddingLeft="2dp"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical|left"
-                android:drawablePadding="3dp"
-                android:text="@string/make_available_offline"
-                android:drawableLeft="@drawable/ic_manage_pin"/>
-        <ProgressBar android:id="@+id/progress"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:max="100"
-                android:progress="30"
-                android:secondaryProgress="65"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:layout_weight="1"
-                android:layout_width="match_parent"
-                android:layout_height="10dp"/>
-        <TextView android:id="@+id/status"
-                android:paddingRight="2dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-        <View android:layout_width="2dp"
-                android:layout_height="match_parent"
-                android:background="@android:drawable/divider_horizontal_dark" />
-        <Button android:id="@+id/done"
-                style="?android:attr/borderlessButtonStyle"
-                android:text="@string/done"
-                android:layout_weight="0"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentRight="true"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"/>
-    </LinearLayout>
-</FrameLayout>
diff --git a/res/layout/manage_offline_bar.xml b/res/layout/manage_offline_bar.xml
index b4bcec225..81853ed88 100644
--- a/res/layout/manage_offline_bar.xml
+++ b/res/layout/manage_offline_bar.xml
@@ -13,50 +13,44 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:background="@drawable/manage_bar">
-    <LinearLayout android:id="@+id/cache_bar"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-        <LinearLayout android:orientation="vertical"
-                android:paddingLeft="10dp"
-                android:paddingRight="5dp"
-                android:paddingBottom="5dp"
-                android:paddingTop="5dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-            <TextView android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="bottom"
-                    android:drawablePadding="3dp"
-                    android:text="@string/make_available_offline"
-                    android:drawableRight="@drawable/ic_manage_pin_small"/>
-            <ProgressBar android:id="@+id/progress"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:max="100"
-                    android:progress="30"
-                    android:secondaryProgress="65"
-                    android:layout_marginTop="2dp"
-                    android:layout_marginBottom="2dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="3dp"/>
-            <TextView android:id="@+id/status"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
-        </LinearLayout>
-        <View android:layout_width="2dp"
-                android:layout_height="match_parent"
-                android:background="@android:drawable/divider_horizontal_dark" />
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+    <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="40dp">
+        <TextView android:id="@+id/status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true" />
+        <ProgressBar android:id="@+id/progress"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:max="100"
+            android:progress="30"
+            android:secondaryProgress="65"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp"
+            android:layout_width="130dp"
+            android:layout_height="4dp"
+            android:layout_below="@id/status"
+            android:layout_centerHorizontal="true"/>
+    </RelativeLayout>
+    <RelativeLayout android:layout_width="fill_parent"
+                android:layout_height="@dimen/manage_cache_bottom_height"
+                android:background="#1f1f1f">
+        <TextView android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/make_available_offline"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:drawableLeft="@drawable/ic_manage_pin_small"
+            android:drawablePadding="3dp"/>
         <Button android:id="@+id/done"
-                style="?android:attr/borderlessButtonStyle"
-                android:text="@string/done"
-                android:layout_weight="0"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentRight="true"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"/>
-    </LinearLayout>
-</FrameLayout>
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="@string/done"
+            android:layout_alignParentRight="true"/>
+    </RelativeLayout>
+</LinearLayout>
diff --git a/res/values-land/dimensions.xml b/res/values-land/dimensions.xml
new file mode 100644
index 000000000..b5c5ed341
--- /dev/null
+++ b/res/values-land/dimensions.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <!-- for manage cache bar -->
+    <dimen name="manage_cache_bottom_height">39dp</dimen>
+</resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 428de3a14..2804bc96d 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -24,11 +24,11 @@
     <integer name="albumset_rows_port">4</integer>
     <dimen name="albumset_slot_gap">1dp</dimen>
 
-    <dimen name="albumset_dark_strip_height">40dp</dimen>
+    <dimen name="albumset_label_background_height">40dp</dimen>
     <dimen name="albumset_title_offset">3dp</dimen>
-    <dimen name="albumset_number_offset">4dp</dimen>
+    <dimen name="albumset_count_offset">4dp</dimen>
     <dimen name="albumset_title_font_size">14sp</dimen>
-    <dimen name="albumset_number_font_size">12sp</dimen>
+    <dimen name="albumset_count_font_size">12sp</dimen>
     <dimen name="albumset_left_margin">6dp</dimen>
     <dimen name="albumset_icon_size">26dp</dimen>
 
@@ -54,4 +54,6 @@
     <dimen name="filmstrip_bar_size">10dp</dimen>
     <dimen name="filmstrip_grip_width">96dp</dimen>
 
+    <!-- for manage cache bar -->
+    <dimen name="manage_cache_bottom_height">48dp</dimen>
 </resources>
-- 
cgit v1.2.3