Move selection to selection pkg, make activity scoped.
Move all other selection related classes to selection pkg.
Change-Id: I57a3964fada55b0f4d073f05a7833455235221b9
diff --git a/src/com/android/documentsui/files/ActionHandler.java b/src/com/android/documentsui/files/ActionHandler.java
index 6a1f3ad..7e94a29 100644
--- a/src/com/android/documentsui/files/ActionHandler.java
+++ b/src/com/android/documentsui/files/ActionHandler.java
@@ -46,11 +46,13 @@
import com.android.documentsui.dirlist.DocumentDetails;
import com.android.documentsui.dirlist.Model;
import com.android.documentsui.dirlist.Model.Update;
-import com.android.documentsui.dirlist.MultiSelectManager;
-import com.android.documentsui.dirlist.MultiSelectManager.Selection;
+import com.android.documentsui.selection.Selection;
+import com.android.documentsui.selection.SelectionManager;
import com.android.documentsui.files.ActionHandler.Addons;
import com.android.documentsui.roots.GetRootDocumentTask;
import com.android.documentsui.roots.RootsAccess;
+import com.android.documentsui.selection.SelectionManager;
+import com.android.documentsui.selection.Selection;
import com.android.documentsui.services.FileOperation;
import com.android.documentsui.services.FileOperationService;
import com.android.documentsui.services.FileOperations;
@@ -466,7 +468,7 @@
mConfig.modelLoadObserved = true;
}
- ActionHandler<T> reset(Model model, MultiSelectManager selectionMgr, boolean searchMode) {
+ ActionHandler<T> reset(Model model, SelectionManager selectionMgr, boolean searchMode) {
mConfig.reset(model, selectionMgr, searchMode);
return this;
}
@@ -474,7 +476,7 @@
private static final class Config {
@Nullable Model model;
- @Nullable MultiSelectManager selectionMgr;
+ @Nullable SelectionManager selectionMgr;
boolean searchMode;
private final EventListener<Update> mModelUpdateListener;
@@ -487,7 +489,7 @@
mModelUpdateListener = modelUpdateListener;
}
- public void reset(Model model, MultiSelectManager selectionMgr, boolean searchMode) {
+ public void reset(Model model, SelectionManager selectionMgr, boolean searchMode) {
assert(model != null);
this.model = model;