diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-04-29 14:27:36 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-29 14:27:36 -0700 |
| commit | ae3088c753f96a2f5c6c9bcdeaeda78114d85024 (patch) | |
| tree | aeb189ecae5f4bec3d73885d1f3ae0bd6b7e84f4 /res | |
| parent | 3833a19d97514fa8b5ad0b88a4400f6a3a2859a4 (diff) | |
| parent | 435d6e5d845c0fe6adb554b9b26b3342c3299a1a (diff) | |
| download | android_packages_apps_Snap-ae3088c753f96a2f5c6c9bcdeaeda78114d85024.tar.gz android_packages_apps_Snap-ae3088c753f96a2f5c6c9bcdeaeda78114d85024.tar.bz2 android_packages_apps_Snap-ae3088c753f96a2f5c6c9bcdeaeda78114d85024.zip | |
Merge "SnapdragonCamera: Add support for ClearSight capture" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/qcomarrays.xml | 10 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 11 | ||||
| -rw-r--r-- | res/xml/camera_preferences.xml | 18 |
3 files changed, 34 insertions, 5 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 40c8b8a77..d3218bdaf 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -873,5 +873,15 @@ <item>@string/pref_camera_mono_preview_value_on</item> <item>@string/pref_camera_mono_preview_value_off</item> </string-array> + + <string-array name="pref_camera_clearsight_entries" translatable="true"> + <item>@string/pref_camera_clearsight_entry_on</item> + <item>@string/pref_camera_clearsight_entry_off</item> + </string-array> + + <string-array name="pref_camera_clearsight_entryvalues" translatable="false"> + <item>@string/pref_camera_clearsight_value_on</item> + <item>@string/pref_camera_clearsight_value_off</item> + </string-array> </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 7812c8b32..ea90cf72a 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -970,5 +970,16 @@ <string name="pref_camera_mono_preview_value_on">on</string> <string name="pref_camera_mono_preview_value_off">off</string> + + <string name="pref_camera_clearsight_title">ClearSight</string> + <string name="pref_camera_clearsight_default" translatable="false">off</string> + <string name="pref_camera_clearsight_entry_on">On</string> + <string name="pref_camera_clearsight_entry_off">Off</string> + + <string name="pref_camera_clearsight_value_on" translatable="false">on</string> + <string name="pref_camera_clearsight_value_off" translatable="false">off</string> + + <string name="clearsight_capture_success">ClearSight capture successful</string> + <string name="clearsight_capture_fail">ClearSight capture failed</string> </resources> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 86eb36f71..5fafb855b 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -381,9 +381,17 @@ 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" /> + camera:defaultValue="@string/pref_camera_mono_preview_default" + camera:entries="@array/pref_camera_mono_preview_entries" + camera:entryValues="@array/pref_camera_mono_preview_entryvalues" + camera:key="pref_camera_mono_preview_key" + camera:title="@string/pref_camera_mono_preview_title" /> + + <ListPreference + camera:defaultValue="@string/pref_camera_clearsight_default" + camera:entries="@array/pref_camera_clearsight_entries" + camera:entryValues="@array/pref_camera_clearsight_entryvalues" + camera:key="pref_camera_clearsight_key" + camera:title="@string/pref_camera_clearsight_title" /> + </PreferenceGroup> |