Move zoom buttons and front/back camera switch to indicator wheel.

bug:5001059

Change-Id: I5ed60169b6f73dc41d84ba7bd299ed8bf394a284

2 files changed, 16 insertions, 57 deletions

diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml
index 5cb52e8..ed4f31b 100644
--- a/res/layout-w1024dp/camera_control.xml
+++ b/res/layout-w1024dp/camera_control.xml
@@ -25,15 +25,6 @@
              this is circular dependency and is not allowed so it's very
              unfortunate that we have to hardcode the width here. -->
 
-        <include android:id="@+id/zoom_picker"
-                layout="@layout/zoom_picker"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentRight="true"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/zoom_picker_margin_top"
-                android:layout_marginRight="@dimen/zoom_picker_margin_right"/>
-
         <com.android.camera.ui.IndicatorWheel android:id="@+id/indicator_wheel"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -47,6 +38,22 @@
                         android:focusable="true"
                         android:src="@drawable/btn_ic_camera_shutter"
                         android:background="@drawable/btn_shutter" />
+            <Button android:id="@+id/zoom_increment"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/btn_zoom_in"
+                    android:visibility="gone" />
+
+            <Button android:id="@+id/zoom_decrement"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/btn_zoom_out"
+                    android:visibility="gone" />
+
+            <com.android.camera.ui.CameraPicker android:id="@+id/camera_picker"
+                    android:clickable="true"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
         </com.android.camera.ui.IndicatorWheel>
 
         <com.android.camera.SwitcherSet android:id="@+id/camera_switch"
@@ -80,13 +87,5 @@
                     android:clickable="false"
                     android:background="@drawable/btn_ic_mode_switch_camera"/>
         </com.android.camera.SwitcherSet>
-        <com.android.camera.ui.CameraPicker android:id="@+id/camera_picker"
-                android:clickable="true"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_toLeftOf="@id/camera_switch"
-                android:layout_marginRight="@dimen/camera_switcher_margin_right"
-                android:layout_marginBottom="@dimen/camera_switcher_margin_bottom" />
 </RelativeLayout>
 
diff --git a/res/layout-w1024dp/zoom_picker.xml b/res/layout-w1024dp/zoom_picker.xml
deleted file mode 100644
index fe3bad3..0000000
--- a/res/layout-w1024dp/zoom_picker.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 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.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true">
-
-    <Button android:id="@+id/zoom_decrement"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/btn_zoom_out"
-            android:visibility="gone" />
-
-    <Button android:id="@+id/zoom_increment"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/zoom_picker_distance"
-            android:background="@drawable/btn_zoom_in"
-            android:visibility="gone" />
-</LinearLayout>