summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
diff options
context:
space:
mode:
authorAlok Kediya <kediya@codeaurora.org>2013-09-28 17:17:09 +0530
committerLinux Build Service Account <lnxbuild@localhost>2013-10-31 19:39:38 -0600
commitc9271fa7e19cf43ec0e8473b08759e5c4f84798b (patch)
tree1f4cb5a893b15f17638e456add42631a95ff44c4 /src/com/android/camera/PhotoMenu.java
parentd8887ed7c40a161431c6b4db32dddcb46859692f (diff)
downloadandroid_packages_apps_Snap-c9271fa7e19cf43ec0e8473b08759e5c4f84798b.tar.gz
android_packages_apps_Snap-c9271fa7e19cf43ec0e8473b08759e5c4f84798b.tar.bz2
android_packages_apps_Snap-c9271fa7e19cf43ec0e8473b08759e5c4f84798b.zip
Camera: Fix issue with dialog box in camera settings
Dialog box is not getting closed even after clicking on "done" button in camera and camcorder settings. This change fixes this issue. (cherrypicked from commit b9f6f18ba263bb36a0bf03cfafb8b91a659cb2e5) Change-Id: Icf5afbb399e5abf93d19a9112200d507355662e6 (cherry picked from commit 2408d38f98dd692b972ec25d10a11bd0d6c15747) (cherry picked from commit e82ce8f4cb6ecd3e702087b4989832dd8a265601)
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rw-r--r--src/com/android/camera/PhotoMenu.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 0f2a94dea..b3eb83375 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -210,10 +210,8 @@ public class PhotoMenu extends PieController
@Override
// Hit when an item in a popup gets selected
public void onListPrefChanged(ListPreference pref) {
- if (mPopup1 != null && mPopup2 != null && mPopup3 != null) {
- if (mPopupStatus == POPUP_SECOND_LEVEL) {
+ if (mPopup != null && mPopup1 != null && mPopup2 != null && mPopup3 != null) {
mUI.dismissPopup();
- }
}
onSettingChanged(pref);
}