summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Newberger <alann@google.com>2014-10-03 17:48:43 -0700
committerAlan Newberger <alann@google.com>2014-10-04 00:54:11 +0000
commit9523a81e2ec56644b994eb6345006ab4d93f74fb (patch)
tree848207fed75ee0a5aa9c2d76a1f94b9fa45eeb08
parente1eb82bcd8050608ec3bda7ddcb7c0de961d93bd (diff)
downloadandroid_packages_apps_Camera2-9523a81e2ec56644b994eb6345006ab4d93f74fb.tar.gz
android_packages_apps_Camera2-9523a81e2ec56644b994eb6345006ab4d93f74fb.tar.bz2
android_packages_apps_Camera2-9523a81e2ec56644b994eb6345006ab4d93f74fb.zip
Fix incorrect key translation in Settings refactor
Bug: 17832052 Change-Id: Ie3ac25a1b9b813295b2bbd6ce723669d30cdb652 (cherry picked from commit 4032a773c4605894a2b6137590c7124ea16b7ab2)
-rw-r--r--src/com/android/camera/widget/IndicatorIconController.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/widget/IndicatorIconController.java b/src/com/android/camera/widget/IndicatorIconController.java
index e99bfe438..2ba1398ae 100644
--- a/src/com/android/camera/widget/IndicatorIconController.java
+++ b/src/com/android/camera/widget/IndicatorIconController.java
@@ -206,7 +206,7 @@ public class IndicatorIconController
} else if (buttonManager.isEnabled(ButtonManager.BUTTON_HDR)
&& buttonManager.isVisible(ButtonManager.BUTTON_HDR)) {
setIndicatorState(SettingsManager.SCOPE_GLOBAL,
- Keys.KEY_CAMERA_HDR_PLUS, mHdrIndicator,
+ Keys.KEY_CAMERA_HDR, mHdrIndicator,
mHdrIndicatorIcons, false);
} else {
changeVisibility(mHdrIndicator, View.GONE);