diff options
| author | Bobby Georgescu <georgescu@google.com> | 2013-04-22 13:40:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-22 13:40:36 -0700 |
| commit | 2b8c1c3300fa4c152a0702e0d5ff51517d5ed054 (patch) | |
| tree | 3596cdfd7a1bcb0d0e871a825ae57efa2d5478fa /src/com/android/gallery3d/ui | |
| parent | ba6b16d99b0faf438ae557a8fdc478101ac75643 (diff) | |
| parent | aca7b2ef1a81d5e4973d1d181df6b983ea6a358c (diff) | |
| download | android_packages_apps_Snap-2b8c1c3300fa4c152a0702e0d5ff51517d5ed054.tar.gz android_packages_apps_Snap-2b8c1c3300fa4c152a0702e0d5ff51517d5ed054.tar.bz2 android_packages_apps_Snap-2b8c1c3300fa4c152a0702e0d5ff51517d5ed054.zip | |
am faf2f040: Fix multi selection issue
* commit 'faf2f040f38532213fa237cf45c9794cf1a85859':
Fix multi selection issue
Diffstat (limited to 'src/com/android/gallery3d/ui')
| -rw-r--r-- | src/com/android/gallery3d/ui/SelectionManager.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/ui/SelectionManager.java b/src/com/android/gallery3d/ui/SelectionManager.java index 9a2396d42..be6811bc1 100644 --- a/src/com/android/gallery3d/ui/SelectionManager.java +++ b/src/com/android/gallery3d/ui/SelectionManager.java @@ -187,8 +187,10 @@ public class SelectionManager { MediaSet set = mSourceMediaSet.getSubMediaSet(i); Path id = set.getPath(); if (!mClickedSet.contains(id)) { - if (expandSet && !expandMediaSet(selected, set, maxSelection)) { - return null; + if (expandSet) { + if (!expandMediaSet(selected, set, maxSelection)) { + return null; + } } else { selected.add(id); if (selected.size() > maxSelection) { @@ -199,9 +201,11 @@ public class SelectionManager { } } else { for (Path id : mClickedSet) { - if (expandSet && !expandMediaSet(selected, - mDataManager.getMediaSet(id), maxSelection)) { - return null; + if (expandSet) { + if (!expandMediaSet(selected, mDataManager.getMediaSet(id), + maxSelection)) { + return null; + } } else { selected.add(id); if (selected.size() > maxSelection) { |