Add zoom picker for xlarge layout.

The zoom of on-screen controls is not created if zoom picker
exists.

Change-Id: I229108aa8bc3eac7175acec46e14240627c7da7c

2 files changed, 54 insertions, 0 deletions

diff --git a/res/layout-xlarge/camera_control.xml b/res/layout-xlarge/camera_control.xml
index b30ac3c..91e11ce 100644
--- a/res/layout-xlarge/camera_control.xml
+++ b/res/layout-xlarge/camera_control.xml
@@ -36,6 +36,17 @@
             android:gravity="center">
     </ListView>
 
+    <ViewStub android:id="@+id/zoom_stub"
+            android:inflatedId="@+id/zoom_picker"
+            android:layout="@layout/zoom_picker"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentRight="true"
+            android:layout_toRightOf="@id/image_list"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_centerInParent="true"/>
+
     <com.android.camera.ShutterButton android:id="@+id/shutter_button"
             android:layout_centerInParent="true"
             android:layout_alignParentRight="true"
diff --git a/res/layout-xlarge/zoom_picker.xml b/res/layout-xlarge/zoom_picker.xml
new file mode 100644
index 0000000..50766d4
--- /dev/null
+++ b/res/layout-xlarge/zoom_picker.xml
@@ -0,0 +1,43 @@
+<?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.
+*/
+-->
+
+<com.android.camera.ZoomPicker xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+    <TextView android:id="@+id/zoom_ratio"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:singleLine="true"
+        android:textColor="@android:color/white"
+        android:textSize="24dp" />
+
+    <Button android:id="@+id/increment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:background="@drawable/btn_zoom_picker_up" />
+
+    <Button android:id="@+id/decrement"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/btn_zoom_picker_down" />
+</com.android.camera.ZoomPicker>