diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-04 07:20:32 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-04 07:20:32 -0800 |
commit | 1a260764f4442a3e6c3277ff9e882f160a10334d (patch) | |
tree | 066e757b4e0529869c7a2391c73ba081974cdce6 /src | |
parent | 78a380e847ca79f3d5bd5365cc2be3b99b4db0ed (diff) | |
parent | 2fa1c956a30ac99b0f13f6b6f752c086e1898654 (diff) | |
download | android_packages_apps_Gallery2-1a260764f4442a3e6c3277ff9e882f160a10334d.tar.gz android_packages_apps_Gallery2-1a260764f4442a3e6c3277ff9e882f160a10334d.tar.bz2 android_packages_apps_Gallery2-1a260764f4442a3e6c3277ff9e882f160a10334d.zip |
Merge "Gallery2: Add leave selection mode judgement"
Diffstat (limited to 'src')
-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)); |