diff options
| author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-02-10 11:47:29 -0800 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2016-03-30 15:54:49 -0700 |
| commit | 1b30b78434547a368de2a918476e749db8dad96c (patch) | |
| tree | 1598bd5094425c582ebd9da4f5a8e3d8a2d9d16c /res | |
| parent | 3618eb79912c36216b197580e54e366ab19d2a61 (diff) | |
| download | android_packages_apps_Snap-1b30b78434547a368de2a918476e749db8dad96c.tar.gz android_packages_apps_Snap-1b30b78434547a368de2a918476e749db8dad96c.tar.bz2 android_packages_apps_Snap-1b30b78434547a368de2a918476e749db8dad96c.zip | |
SnapdragonCamera: Camera2 add dual camera
Add Camera2 dual camera support to SnapdragonCamera
CRs-Fixed: 989750
Change-Id: I45a749ad03a531286a39cbfcfdcb65e5cad4759e
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/capture_module.xml | 4 | ||||
| -rw-r--r-- | res/values/qcomarrays.xml | 10 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 11 | ||||
| -rw-r--r-- | res/xml/camera_preferences.xml | 7 |
4 files changed, 28 insertions, 4 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index 2715dcbe2..02c32acab 100644 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -40,8 +40,8 @@ <SurfaceView android:id="@+id/mdp_preview_content2" - android:layout_width="100dp" - android:layout_height="100dp" /> + android:layout_width="300dp" + android:layout_height="300dp" /> </FrameLayout> <View diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index a4c463735..40c8b8a77 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -863,5 +863,15 @@ <item>@string/pref_camera_dual_camera_value_bayer</item> <item>@string/pref_camera_dual_camera_value_mono</item> </string-array> + + <string-array name="pref_camera_mono_preview_entries" translatable="true"> + <item>@string/pref_camera_mono_preview_entry_on</item> + <item>@string/pref_camera_mono_preview_entry_off</item> + </string-array> + + <string-array name="pref_camera_mono_preview_entryvalues" translatable="false"> + <item>@string/pref_camera_mono_preview_value_on</item> + <item>@string/pref_camera_mono_preview_value_off</item> + </string-array> </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 0e21bb5e6..888000c36 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -953,9 +953,8 @@ <string name="pref_camera_camera2_value_enable">enable</string> <string name="pref_camera_camera2_value_disable">disable</string> - <string name="pref_camera_dual_camera_title">Dual Camera Mode</string> - <string name="pref_camera_dual_camera_default">bayer</string> + <string name="pref_camera_dual_camera_default">dual</string> <string name="pref_camera_dual_camera_entry_dual">Dual-camera Linked</string> <string name="pref_camera_dual_camera_entry_bayer">Single Bayer Camera</string> <string name="pref_camera_dual_camera_entry_mono">Single Mono Camera</string> @@ -963,5 +962,13 @@ <string name="pref_camera_dual_camera_value_dual">dual</string> <string name="pref_camera_dual_camera_value_bayer">bayer</string> <string name="pref_camera_dual_camera_value_mono">mono</string> + + <string name="pref_camera_mono_preview_title">Mono Preview</string> + <string name="pref_camera_mono_preview_default">off</string> + <string name="pref_camera_mono_preview_entry_on">On</string> + <string name="pref_camera_mono_preview_entry_off">Off</string> + + <string name="pref_camera_mono_preview_value_on">on</string> + <string name="pref_camera_mono_preview_value_off">off</string> </resources> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 028ff4dbf..86eb36f71 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -379,4 +379,11 @@ camera:title="@string/pref_camera_dual_camera_title" camera:entries="@array/pref_camera_dual_camera_entries" camera:entryValues="@array/pref_camera_dual_camera_entryvalues" /> + + <ListPreference + camera:key="pref_camera_mono_preview_key" + camera:defaultValue="@string/pref_camera_mono_preview_default" + camera:title="@string/pref_camera_mono_preview_title" + camera:entries="@array/pref_camera_mono_preview_entries" + camera:entryValues="@array/pref_camera_mono_preview_entryvalues" /> </PreferenceGroup> |