From 551b3b04ddfcb1e81deb04416614c49beadf1434 Mon Sep 17 00:00:00 2001 From: Jay Wang Date: Wed, 6 Jul 2016 14:53:29 -0700 Subject: 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 --- src/com/android/camera/PhotoMenu.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 083b019c4..6a1f08597 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -820,10 +820,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; -- cgit v1.2.3