summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoMenu.java
diff options
context:
space:
mode:
authorGuruprasad Gaonkar <ggaonk@codeaurora.org>2015-04-15 17:49:41 -0700
committerGuruprasad Gaonkar <ggaonk@codeaurora.org>2015-04-29 16:51:48 -0700
commitdbe109f4a14783260235c277caf8973fdbb0b945 (patch)
treeb3d9aafeb275093f1f9675bdb6b9f973ffde0829 /src/com/android/camera/VideoMenu.java
parent09db6ed4599bb6686e81a45e9fb1e0287c0eb7f7 (diff)
downloadandroid_packages_apps_Snap-dbe109f4a14783260235c277caf8973fdbb0b945.tar.gz
android_packages_apps_Snap-dbe109f4a14783260235c277caf8973fdbb0b945.tar.bz2
android_packages_apps_Snap-dbe109f4a14783260235c277caf8973fdbb0b945.zip
SnapDragon: Changes to fix popup menu issue in camcorder
In Camorcer application, setting menu were not responding sometime. Change is to fix popup state machine issue. Change-Id: I8bde95171caf30dccaaf8222dd6ecbfd92849da3
Diffstat (limited to 'src/com/android/camera/VideoMenu.java')
-rw-r--r--src/com/android/camera/VideoMenu.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index da5c062e8..49d33d3be 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -693,11 +693,11 @@ public class VideoMenu extends MenuController
@Override
public void overrideSettings(final String... keyvalues) {
- overrideCDSMode();
super.overrideSettings(keyvalues);
- if (((mListMenu == null)) || mPopupStatus != POPUP_FIRST_LEVEL) {
- mPopupStatus = POPUP_FIRST_LEVEL;
+ if (mListMenu == null) {
initializePopup();
+ } else {
+ overrideCDSMode();
}
mListMenu.overrideSettings(keyvalues);