diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-04-15 00:48:23 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-15 00:48:23 -0700 |
| commit | e26ec1f11dca6c97a6c87844b8f1f25b9a7c7440 (patch) | |
| tree | dbd130d1e532e3be658e86616c162fd0748ece83 | |
| parent | 440f49207a36bcbfe3916943930777f4f8aa58a2 (diff) | |
| parent | 671cc5a9a56a29a303e11ac67e43e5b93020f645 (diff) | |
| download | android_packages_apps_Gallery2-e26ec1f11dca6c97a6c87844b8f1f25b9a7c7440.tar.gz android_packages_apps_Gallery2-e26ec1f11dca6c97a6c87844b8f1f25b9a7c7440.tar.bz2 android_packages_apps_Gallery2-e26ec1f11dca6c97a6c87844b8f1f25b9a7c7440.zip | |
Merge "Gallery2: Fix the selected picture is not selected after unlock." into android_ui.lnx.1.2.c1-dev
| -rwxr-xr-x | src/com/android/gallery3d/app/TimeLinePage.java | 3 | ||||
| -rw-r--r-- | src/com/android/gallery3d/ui/ActionModeHandler.java | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/app/TimeLinePage.java b/src/com/android/gallery3d/app/TimeLinePage.java index cefe6a797..a1f56b062 100755 --- a/src/com/android/gallery3d/app/TimeLinePage.java +++ b/src/com/android/gallery3d/app/TimeLinePage.java @@ -465,9 +465,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(); } } |