summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoMenu.java4
-rw-r--r--src/com/android/camera/VideoMenu.java6
2 files changed, 3 insertions, 7 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 6af88cc9d..8bdbb6c47 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -242,9 +242,8 @@ public class PhotoMenu extends MenuController
@Override
// Hit when an item in a popup gets selected
public void onListPrefChanged(ListPreference pref) {
- animateFadeOut(mListSubMenu, 2);
onSettingChanged(pref);
- ((ListMenu) mListMenu).resetHighlight();
+ closeView();
}
public boolean handleBackKey() {
@@ -1024,6 +1023,7 @@ public class PhotoMenu extends MenuController
}
View border = v.findViewById(R.id.border);
border.setBackgroundResource(R.drawable.scene_mode_view_border_selected);
+ animateSlideOutPreviewMenu();
}
}
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 49d33d3be..b914f2cf8 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -707,11 +707,7 @@ public class VideoMenu extends MenuController
// Hit when an item in the second-level popup gets selected
public void onListPrefChanged(ListPreference pref) {
onSettingChanged(pref);
- if (mPopupStatus == POPUP_SECOND_LEVEL) {
- mListMenu.reloadPreference();
- animateFadeOut(mListSubMenu, 2);
- ((ListMenu) mListMenu).resetHighlight();
- }
+ closeView();
}
protected void initializePopup() {