Refresh the action bar timeout when button is clicked.

Also handle with the confirm dialog, we show the action bar
as long as the confirm dialog is shown. And we start to timeout
the action bar when the confirm dialog get dismissed.

bug: 6478646
Change-Id: I3f0e7e61b43b0dd2bb2b1e2b4444c8dcb5706e1a

1 files changed, 25 insertions, 4 deletions

diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 1778f261b..68406ccd2 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -521,8 +521,28 @@ public class PhotoPage extends ActivityState implements
         return true;
     }
 
+    private MenuExecutor.ProgressListener mConfirmDialogListener =
+            new MenuExecutor.ProgressListener() {
+        @Override
+        public void onProgressUpdate(int index) {}
+
+        @Override
+        public void onProgressComplete(int result) {}
+
+        @Override
+        public void onConfirmDialogShown() {
+            mHandler.removeMessages(MSG_HIDE_BARS);
+        }
+
+        @Override
+        public void onConfirmDialogDismissed(boolean confirmed) {
+            refreshHidingMessage();
+        }
+    };
+
     @Override
     protected boolean onItemSelected(MenuItem item) {
+        refreshHidingMessage();
         MediaItem current = mModel.getMediaItem(0);
 
         if (current == null) {
@@ -586,7 +606,7 @@ public class PhotoPage extends ActivityState implements
             case R.id.action_show_on_map:
                 mSelectionManager.deSelectAll();
                 mSelectionManager.toggle(path);
-                mMenuExecutor.onMenuClicked(item, confirmMsg, null);
+                mMenuExecutor.onMenuClicked(item, confirmMsg, mConfirmDialogListener);
                 return true;
             case R.id.action_import:
                 mSelectionManager.deSelectAll();
@@ -767,11 +787,12 @@ public class PhotoPage extends ActivityState implements
 
     @Override
     public void onPause() {
+        super.onPause();
+        mIsActive = false;
+
         mActivity.getGLRoot().unfreeze();
         mHandler.removeMessages(MSG_UNFREEZE_GLROOT);
-        super.onPause();
         if (isFinishing()) preparePhotoFallbackView();
-        mIsActive = false;
 
         DetailsHelper.pause();
         mPhotoView.pause();
@@ -789,8 +810,8 @@ public class PhotoPage extends ActivityState implements
 
     @Override
     protected void onResume() {
-        mActivity.getGLRoot().freeze();
         super.onResume();
+        mActivity.getGLRoot().freeze();
         mIsActive = true;
         setContentPane(mRootPane);