From ac41f662caf6589eac2b9e9e311a2e99db4aa9cb Mon Sep 17 00:00:00 2001
From: huiyan <huiyan@codeaurora.org>
Date: Sat, 26 Mar 2016 17:46:52 +0800
Subject: Gallery2: Fix the selected picture is not selected after unlock.

The TimeLinePage leave selection mode when onPause.
So the selected picture is not selected when onResume.

The TimeLinePage don't leave selection mode when onPause.
If page is in selection mode, make toolbar invisible when onResume.

Change-Id: Ieecdca955e66d783ada293db2b43039948fc443c
CRs-Fixed: 986687
---
 src/com/android/gallery3d/app/TimeLinePage.java     | 3 ---
 src/com/android/gallery3d/ui/ActionModeHandler.java | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/com/android/gallery3d/app/TimeLinePage.java b/src/com/android/gallery3d/app/TimeLinePage.java
index 618f219f4..b318aaf07 100644
--- a/src/com/android/gallery3d/app/TimeLinePage.java
+++ b/src/com/android/gallery3d/app/TimeLinePage.java
@@ -459,9 +459,6 @@ public class TimeLinePage extends ActivityState implements
         super.onPause();
         mIsActive = false;
 
-        if (mSelectionManager.inSelectionMode()) {
-            mSelectionManager.leaveSelectionMode();
-        }
         mAlbumView.setSlotFilter(null);
         mActionModeHandler.pause();
         mAlbumDataAdapter.pause();
diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java
index 4024fc9d7..126d7936c 100644
--- a/src/com/android/gallery3d/ui/ActionModeHandler.java
+++ b/src/com/android/gallery3d/ui/ActionModeHandler.java
@@ -585,7 +585,10 @@ public class ActionModeHandler implements Callback, PopupList.OnPopupItemClickLi
     }
 
     public void resume() {
-        if (mSelectionManager.inSelectionMode()) updateSupportedOperation();
+        if (mSelectionManager.inSelectionMode()) {
+            mActivity.getToolbar().setVisibility(View.INVISIBLE);
+            updateSupportedOperation();
+        }
         mMenuExecutor.resume();
     }
 }
-- 
cgit v1.2.3