From ff45331706e2fe361b4ff736d90b0ad4af0e7be9 Mon Sep 17 00:00:00 2001
From: Chung-yih Wang <cywang@google.com>
Date: Fri, 19 Aug 2011 00:06:51 +0800
Subject: Refactor indicator wheel.

+add IndicatorControlWheel container.

Change-Id: Ia3c7f0441de75a70c8a2172e86d3812b2ef1a15b
---
 res/layout-w1024dp/camera_control.xml | 50 ++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 24 deletions(-)

(limited to 'res/layout-w1024dp')

diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml
index 2ce91b6..23bad2b 100644
--- a/res/layout-w1024dp/camera_control.xml
+++ b/res/layout-w1024dp/camera_control.xml
@@ -28,33 +28,35 @@
 
         <include layout="@layout/review_thumbnail" />
 
-        <com.android.camera.ui.IndicatorWheel android:id="@+id/indicator_control"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_alignParentRight="true">
+        <com.android.camera.ui.IndicatorControlWheelContainer android:id="@+id/indicator_control"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true">
             <com.android.camera.ShutterButton android:id="@+id/shutter_button"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:scaleType="center"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="@drawable/btn_shutter" />
-            <com.android.camera.ui.RotateImageView android:id="@+id/zoom_increment"
-                    android:clickable="true"
-                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/btn_zoom_in"
-                    android:visibility="gone" />
-
-            <com.android.camera.ui.RotateImageView android:id="@+id/zoom_decrement"
-                    android:clickable="true"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/btn_zoom_out"
-                    android:visibility="gone" />
-        </com.android.camera.ui.IndicatorWheel>
-
+                    android:scaleType="center"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="@drawable/btn_shutter" />
+            <com.android.camera.ui.IndicatorControlWheel android:id="@+id/indicator_control_wheel"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+                <com.android.camera.ui.RotateImageView android:id="@+id/zoom_increment"
+                        android:clickable="true"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/btn_zoom_in"
+                        android:visibility="gone" />
+                <com.android.camera.ui.RotateImageView android:id="@+id/zoom_decrement"
+                        android:clickable="true"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/btn_zoom_out"
+                        android:visibility="gone" />
+            </com.android.camera.ui.IndicatorControlWheel>
+        </com.android.camera.ui.IndicatorControlWheelContainer>
         <com.android.camera.ui.ZoomPicker
                 android:id="@+id/zoom_control"
                 android:layout_width="wrap_content"
-- 
cgit v1.1