diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2014-05-28 17:01:33 +0800 |
|---|---|---|
| committer | kaiyiz <kaiyiz@codeaurora.org> | 2014-05-28 17:06:25 +0800 |
| commit | 0ca51ec7d56c89205a99996c74d1e3e9d36c85ed (patch) | |
| tree | 68bc62bd704b286f3db774491a72a8d2ebef56a6 /res | |
| parent | 0542ce1f6f50af1ef45d8623ff3cdc2cc3a92f6b (diff) | |
| download | android_packages_apps_Snap-0ca51ec7d56c89205a99996c74d1e3e9d36c85ed.tar.gz android_packages_apps_Snap-0ca51ec7d56c89205a99996c74d1e3e9d36c85ed.tar.bz2 android_packages_apps_Snap-0ca51ec7d56c89205a99996c74d1e3e9d36c85ed.zip | |
Camera2: Make Continuous Shot off when HDR on.
The HDR function can not existed with the Continuous Shot
function,so change code to achieve the function like that
when we open HDR function ,make the Continuous Shot off,
and we close HDR,make the Continuous Shot on.
CRs-fixed: 667319
Change-Id: I75ab5d268c1feb2d95ff6a6b0f35dcf96d8cc953
Diffstat (limited to 'res')
| -rw-r--r-- | res/values-zh-rCN/strings.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index b2c2319a2..39c8e0f3a 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -488,4 +488,5 @@ <string name="hdr_enable_message">HDR启用后，只支持自动场景模式</string> <string name="scene_enable_message">HDR不支持自动场景以外模式</string> + <string name="HDR_disable_continuous_shot">"开启HDR将禁用连拍功能"</string> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 370254961..fc183f643 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -413,6 +413,9 @@ <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] --> <string name="not_selectable_in_scene_mode">Not selectable in scene mode.</string> + <!-- Toast after enable HDR function to inform Continuous Shot has disabled --> + <string name="HDR_disable_continuous_shot">Enable HDR will disable Continuous Shot.</string> + <!-- Exposure settings in preference --> <string name="pref_exposure_title">Exposure</string> <string name="pref_exposure_default" translatable="false">0</string> |