summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuruprasad Gaonkar <ggaonk@codeaurora.org>2015-04-15 17:49:41 -0700
committerSteve Kondik <steve@cyngn.com>2016-07-30 05:05:25 -0700
commit2428156332b92a090e86444b6fd17ab4b33bd80f (patch)
tree724d4881cad6bc93066c4392a90cfa1066755b15
parent1fddfd09e3215be615d9402bd6e0f98c92414f44 (diff)
downloadandroid_packages_apps_Snap-2428156332b92a090e86444b6fd17ab4b33bd80f.zip
android_packages_apps_Snap-2428156332b92a090e86444b6fd17ab4b33bd80f.tar.gz
android_packages_apps_Snap-2428156332b92a090e86444b6fd17ab4b33bd80f.tar.bz2
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
-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 1541acb..a792be2 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -652,11 +652,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);