From 2428156332b92a090e86444b6fd17ab4b33bd80f Mon Sep 17 00:00:00 2001
From: Guruprasad Gaonkar <ggaonk@codeaurora.org>
Date: Wed, 15 Apr 2015 17:49:41 -0700
Subject: 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
---
 src/com/android/camera/VideoMenu.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 1541acbb1..a792be2ec 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);
 
-- 
cgit v1.2.3