diff options
| author | Byunghun Jeon <bjeon@codeaurora.org> | 2015-08-28 15:53:51 -0700 |
|---|---|---|
| committer | Byunghun Jeon <bjeon@codeaurora.org> | 2015-08-28 15:57:32 -0700 |
| commit | b5efc7d3c6b83835a1b8aae392cff4b8a65f7bda (patch) | |
| tree | 3433db115995310a21adc523d0211b4c10bde1b1 /src | |
| parent | c68df0f4b9fdc0037bc8c9a6cc2f5bd20c259fc4 (diff) | |
| download | android_packages_apps_Snap-b5efc7d3c6b83835a1b8aae392cff4b8a65f7bda.tar.gz android_packages_apps_Snap-b5efc7d3c6b83835a1b8aae392cff4b8a65f7bda.tar.bz2 android_packages_apps_Snap-b5efc7d3c6b83835a1b8aae392cff4b8a65f7bda.zip | |
SnapdragonCamera: Close setting/scene mode when setting is selected
Close setting/scene mode when setting is selected
Change-Id: I584b7eaea25774ec4906a40ddae2eda89646893e
CRs-Fixed: 898871
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/VideoMenu.java | 6 |
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() { |