diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-10-17 23:40:33 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-17 23:40:33 -0700 |
| commit | bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398 (patch) | |
| tree | 85d07b2095695fe79235ab16e627f8b22c7bfd8d /src/com/android/gallery3d/ui/ActionModeHandler.java | |
| parent | a3fcd50080c0546ebd5f0caf932eef02fabdd7ad (diff) | |
| parent | 8de528917bf03cca93ac2a3dd19b7a5719d1a26e (diff) | |
| download | android_packages_apps_Gallery2-bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398.tar.gz android_packages_apps_Gallery2-bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398.tar.bz2 android_packages_apps_Gallery2-bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398.zip | |
Merge branch 'cm-12.1' of git://github.com/CyanogenMod/android_packages_apps_Gallery2 into cm-13.0
Change-Id: Ib8caa024d2e6feca332e3645038f226fd5a910a2
Diffstat (limited to 'src/com/android/gallery3d/ui/ActionModeHandler.java')
| -rw-r--r-- | src/com/android/gallery3d/ui/ActionModeHandler.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/ui/ActionModeHandler.java b/src/com/android/gallery3d/ui/ActionModeHandler.java index 6b4f10312..411c578a5 100644 --- a/src/com/android/gallery3d/ui/ActionModeHandler.java +++ b/src/com/android/gallery3d/ui/ActionModeHandler.java @@ -272,7 +272,7 @@ public class ActionModeHandler implements Callback, PopupList.OnPopupItemClickLi ArrayList<MediaObject> selected = new ArrayList<MediaObject>(); DataManager manager = mActivity.getDataManager(); for (Path path : unexpandedPaths) { - if (jc.isCancelled()) { + if (jc.isCancelled() || !mSelectionManager.inSelectionMode()) { return null; } selected.add(manager.getMediaObject(path)); |