summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/AlbumSetPage.java
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-12-03 13:56:00 -0800
committerBobby Georgescu <georgescu@google.com>2012-12-03 16:15:54 -0800
commit32f5fee98df0e2f4b30475bb2d04e5fafa969727 (patch)
tree846c279a0fa07dc59df716cc52cba178b7b11168 /src/com/android/gallery3d/app/AlbumSetPage.java
parent8d26578f8db895dadb7e0e1d7a56c00fa18183ec (diff)
downloadandroid_packages_apps_Snap-32f5fee98df0e2f4b30475bb2d04e5fafa969727.tar.gz
android_packages_apps_Snap-32f5fee98df0e2f4b30475bb2d04e5fafa969727.tar.bz2
android_packages_apps_Snap-32f5fee98df0e2f4b30475bb2d04e5fafa969727.zip
Move MenuExecutor operations into Service
Bug: 6680729 Change-Id: I538bb0a8783f7c1ff467ba8d8eb0deefdc0b6ea2
Diffstat (limited to 'src/com/android/gallery3d/app/AlbumSetPage.java')
-rw-r--r--src/com/android/gallery3d/app/AlbumSetPage.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index ed06f46ae..df68ffbaa 100644
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -351,8 +351,9 @@ public class AlbumSetPage extends ActivityState implements
@Override
public void onDestroy() {
- cleanupCameraButton();
super.onDestroy();
+ cleanupCameraButton();
+ mActionModeHandler.destroy();
}
private boolean setupCameraButton() {
@@ -437,9 +438,9 @@ public class AlbumSetPage extends ActivityState implements
public void onPause() {
super.onPause();
mIsActive = false;
- mActionModeHandler.pause();
mAlbumSetDataAdapter.pause();
mAlbumSetView.pause();
+ mActionModeHandler.pause();
mEyePosition.pause();
DetailsHelper.pause();
// Call disableClusterMenu to avoid receiving callback after paused.