diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-05-07 04:43:48 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-05-07 04:43:48 -0700 |
| commit | 852d50c360f30099b2538488aafe5a14bebc98b7 (patch) | |
| tree | 378ba6a80bf22cfecf87450a40897baab51b0818 | |
| parent | 4a7636efec4a1dacfe6e70cfd119675270f46f75 (diff) | |
| parent | dbe109f4a14783260235c277caf8973fdbb0b945 (diff) | |
| download | android_packages_apps_Snap-852d50c360f30099b2538488aafe5a14bebc98b7.tar.gz android_packages_apps_Snap-852d50c360f30099b2538488aafe5a14bebc98b7.tar.bz2 android_packages_apps_Snap-852d50c360f30099b2538488aafe5a14bebc98b7.zip | |
Merge "SnapDragon: Changes to fix popup menu issue in camcorder"
| -rw-r--r-- | src/com/android/camera/VideoMenu.java | 6 |
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); |