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/layout/manage_offline_bar.xml | 86 ++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 46 deletions(-)

(limited to 'res/layout')

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>
-- 
cgit v1.2.3