diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-04-21 05:16:36 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-04-21 05:16:36 -0700 |
| commit | f75754ce419a1363a9819b576c40424bb152db9b (patch) | |
| tree | d95502f24c533e9f9d9482386519ce585cecef14 /res/values | |
| parent | 1583684d4829f852971e85bb6bbd023ce2969afd (diff) | |
| parent | 28bcccd399442239a32ab1024b0c09c9c5a25b8c (diff) | |
| download | android_packages_apps_Snap-f75754ce419a1363a9819b576c40424bb152db9b.tar.gz android_packages_apps_Snap-f75754ce419a1363a9819b576c40424bb152db9b.tar.bz2 android_packages_apps_Snap-f75754ce419a1363a9819b576c40424bb152db9b.zip | |
Merge "Camera2: add UI option to on/off longshot"
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/qcomarrays.xml | 11 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 4 |
2 files changed, 15 insertions, 0 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 07bb7eb6c..dfdd67cd3 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -579,5 +579,16 @@ <item>@string/pref_camera_advanced_feature_value_optizoom_on</item> </string-array> + <!-- Camera Preferences Long Shot dialog box entries --> + <string-array name="pref_camera_longshot_entries" translatable="false"> + <item>@string/setting_off</item> + <item>@string/setting_on</item> + </string-array> + + <string-array name="pref_camera_longshot_entryvalues" translatable="false"> + <item>@string/setting_off_value</item> + <item>@string/setting_on_value</item> + </string-array> + </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index af5bb2e27..d38eebddb 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -651,5 +651,9 @@ <string name="time_lapse_error">Invalid video-size for time-lapse recording.</string> <string name="pref_camera_videosnapsize_default" translatable="false">1920x1080</string> + + <!-- longshot value --> + <string name="pref_camera_longshot_default" translatable="false">off</string> + <string name="pref_camera_longshot_title">Continuous Shot</string> </resources> |