From 32f5fee98df0e2f4b30475bb2d04e5fafa969727 Mon Sep 17 00:00:00 2001
From: Bobby Georgescu <georgescu@google.com>
Date: Mon, 3 Dec 2012 13:56:00 -0800
Subject: Move MenuExecutor operations into Service

Bug: 6680729
Change-Id: I538bb0a8783f7c1ff467ba8d8eb0deefdc0b6ea2
---
 src/com/android/gallery3d/app/AlbumSetPage.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/com/android/gallery3d/app/AlbumSetPage.java')

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.
-- 
cgit v1.2.3