From 0160260eb1991093e6961c63c7a72bd4b80c7589 Mon Sep 17 00:00:00 2001
From: weijiew <weijiew@codeaurora.org>
Date: Mon, 20 Feb 2017 14:25:22 +0800
Subject: SnapdragonCamera: Add zoom option to developer option for camera2

For automation testing, we need a way to adjust the zoom without
using the pinch gesture. Therefore, adding zoom option preference
to the developer option.

CRs-Fixed: 2008116
Change-Id: Ie459dbbb28051d49f8e4951d6adb112d03cf22f6
---
 res/xml/capture_preferences.xml      | 7 +++++++
 res/xml/setting_menu_preferences.xml | 9 +++++++++
 2 files changed, 16 insertions(+)

(limited to 'res/xml')

diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml
index 8dd3eb732..dc8191ba3 100644
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -342,4 +342,11 @@
         camera:title="@string/pref_camera2_saveraw_title"
         camera:entries="@array/pref_camera2_saveraw_entries"
         camera:entryValues="@array/pref_camera2_saveraw_entryvalues" />
+
+    <ListPreference
+        camera:key="pref_camera2_zoom_key"
+        camera:defaultValue="@string/pref_camera_zoom_default"
+        camera:title="@string/pref_camera_zoom_title"
+        camera:entries="@array/pref_camera_zoom_entries"
+        camera:entryValues="@array/pref_camera_zoom_entryvalues" />
 </PreferenceGroup>
diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml
index d7813102a..3c311245b 100644
--- a/res/xml/setting_menu_preferences.xml
+++ b/res/xml/setting_menu_preferences.xml
@@ -338,5 +338,14 @@
             android:layout="@layout/preference"
             android:summary="%s"
             android:title="@string/pref_camera2_saveraw_title" />
+
+        <ListPreference
+            android:key="pref_camera2_zoom_key"
+            android:defaultValue="@string/pref_camera_zoom_default"
+            android:title="@string/pref_camera_zoom_title"
+            android:summary="%s"
+            android:entries="@array/pref_camera_zoom_entries"
+            android:entryValues="@array/pref_camera_zoom_entryvalues" />
+
     </PreferenceCategory>
 </PreferenceScreen>
-- 
cgit v1.2.3