summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Wang <jaywang@codeaurora.org>2016-07-06 14:53:29 -0700
committerSteve Kondik <steve@cyngn.com>2016-08-03 15:45:47 -0700
commitee8c922bfd77879d72bf607eb87587fefeef25e1 (patch)
treee96de3e4a6c9d563e1e354b0e70a2cb0cd347974
parenta58a5375cb5b5879f6708c86cf161f06dbc6269d (diff)
downloadandroid_packages_apps_Snap-ee8c922bfd77879d72bf607eb87587fefeef25e1.zip
android_packages_apps_Snap-ee8c922bfd77879d72bf607eb87587fefeef25e1.tar.gz
android_packages_apps_Snap-ee8c922bfd77879d72bf607eb87587fefeef25e1.tar.bz2
SnapdragonCamera: Fix the issue that camera control is removed
Fix the issue that camera control menu is removed after HDR icon is clicked from camera control menu. Change-Id: I6e7c1a81fa356d0fa6cb5eb336ef844266a1bbf0 CRs-Fixed: 1038311
-rw-r--r--src/com/android/camera/PhotoMenu.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 0927fee..8556a23 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -694,10 +694,13 @@ public class PhotoMenu extends MenuController
.findPreference(prefKey);
if (pref == null)
return;
- // Hide the camera control while switching the camera.
- // The camera control will be added back when
- // onCameraPickerClicked is completed
- mUI.hideUI();
+
+ if (prefKey.equals(CameraSettings.KEY_CAMERA_ID)) {
+ // Hide the camera control while switching the camera.
+ // The camera control will be added back when
+ // onCameraPickerClicked is completed
+ mUI.hideUI();
+ }
int index = pref.findIndexOfValue(pref.getValue());
CharSequence[] values = pref.getEntryValues();
index = (index + 1) % values.length;