From 20ff6a12d36dd928e6ccfb96aebf9f6481d15697 Mon Sep 17 00:00:00 2001
From: Chung-yih Wang <cywang@google.com>
Date: Thu, 8 Sep 2011 10:35:03 +0800
Subject: Modify the Mode Picker to follow UI spec.

bug:5141384
bug:5141387
bug:5287560

+Follow the 'redlines' UI guidelines.

Change-Id: Ib46f4d45beb0e390933957727902d2d1f9e81211
---
 res/layout-w1024dp/mode_picker.xml | 54 ++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

(limited to 'res/layout-w1024dp')

diff --git a/res/layout-w1024dp/mode_picker.xml b/res/layout-w1024dp/mode_picker.xml
index a827f95..a77485d 100644
--- a/res/layout-w1024dp/mode_picker.xml
+++ b/res/layout-w1024dp/mode_picker.xml
@@ -15,44 +15,42 @@
 -->
 <com.android.camera.ModePicker xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/mode_picker"
-            android:layout_width="186dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:layout_centerHorizontal="true"
             android:layout_alignParentBottom="true"
             android:visibility="gone">
-        <com.android.camera.ui.RotateImageView android:id="@+id/current_mode"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentRight="true"
-                android:layout_height="62dp"
-                android:layout_width="62dp"
-                android:scaleType="center"
-                android:background="@drawable/btn_mode_background"
-                android:src="@drawable/btn_ic_camera" />
+        <View android:id="@+id/current_mode_bar"
+                android:layout_width="wrap_content"
+                android:layout_height="4dp"
+                android:layout_marginTop="12dp"
+                android:layout_below="@+id/mode_selection"
+                android:background="@color/review_control_pressed_color"/>
         <LinearLayout android:id="@+id/mode_selection"
                 android:orientation="horizontal"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="32dp"
+                android:layout_marginRight="32dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:background="@android:color/black"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentBottom="true"
-                android:gravity="center"
-                android:visibility="gone">
-            <com.android.camera.ui.RotateImageView android:id="@+id/mode_panorama"
-                    android:layout_height="62dp"
-                    android:layout_width="62dp"
+                android:gravity="center">
+            <com.android.camera.ui.RotateImageView android:id="@+id/mode_camera"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:scaleType="center"
-                    android:src="@drawable/btn_ic_panorama" />
+                    android:src="@drawable/ic_switch_camera_holo_light" />
             <com.android.camera.ui.RotateImageView android:id="@+id/mode_video"
-                    android:layout_height="62dp"
-                    android:layout_width="62dp"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:scaleType="center"
-                    android:src="@drawable/btn_ic_video" />
-            <com.android.camera.ui.RotateImageView android:id="@+id/mode_camera"
-                    android:layout_height="62dp"
-                    android:layout_width="62dp"
+                    android:src="@drawable/ic_switch_video_holo_light" />
+            <com.android.camera.ui.RotateImageView android:id="@+id/mode_panorama"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:scaleType="center"
-                    android:src="@drawable/btn_ic_camera" />
+                    android:src="@drawable/ic_switch_pan_holo_light" />
         </LinearLayout>
 </com.android.camera.ModePicker>
 
-- 
cgit v1.1