diff options
| author | Alan Newberger <alann@google.com> | 2014-10-06 21:20:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-06 21:20:51 +0000 |
| commit | 0ac0b733d510fc17d072c61055c0e2ad446689ff (patch) | |
| tree | 16962d9f8db29d6a939014c400f5eec6a193985b | |
| parent | d30fdee360db38e93e4639bd1c28049d0b6b09e0 (diff) | |
| parent | 9523a81e2ec56644b994eb6345006ab4d93f74fb (diff) | |
| download | android_packages_apps_Camera2-0ac0b733d510fc17d072c61055c0e2ad446689ff.tar.gz android_packages_apps_Camera2-0ac0b733d510fc17d072c61055c0e2ad446689ff.tar.bz2 android_packages_apps_Camera2-0ac0b733d510fc17d072c61055c0e2ad446689ff.zip | |
Merge "Fix incorrect key translation in Settings refactor" into lmp-dev
| -rw-r--r-- | src/com/android/camera/widget/IndicatorIconController.java | 2 |
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); |