commit 4f78ba643270b9d84da1952d8e408220b25ec6fd
author Steve McKay <smckay@google.com> Tue Oct 04 16:48:49 2016 -0700
committer Steve McKay <smckay@google.com> Fri Oct 07 11:17:57 2016 -0700
tree b47cf111f2a423dd64640c373a99d919079bcc55
parent d9ce5bf3f2c5c98adc0ba59c207fba4825e48f6f

Move selection to selection pkg, make activity scoped.

Move all other selection related classes to selection pkg.

Change-Id: I57a3964fada55b0f4d073f05a7833455235221b9

src/com/android/documentsui/dirlist/ActionModeController.java

diff --git a/src/com/android/documentsui/dirlist/ActionModeController.java b/src/com/android/documentsui/dirlist/ActionModeController.java
index 4e89cb1..6952d47 100644
--- a/src/com/android/documentsui/dirlist/ActionModeController.java
+++ b/src/com/android/documentsui/dirlist/ActionModeController.java
@@ -37,7 +37,8 @@
 import com.android.documentsui.base.EventHandler;
 import com.android.documentsui.base.Menus;
 import com.android.documentsui.base.Shared;
-import com.android.documentsui.dirlist.MultiSelectManager.Selection;
+import com.android.documentsui.selection.Selection;
+import com.android.documentsui.selection.SelectionManager;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -46,12 +47,12 @@
 /**
  * A controller that listens to selection changes and manages life cycles of action modes.
  */
-public class ActionModeController implements MultiSelectManager.Callback, ActionMode.Callback {
+public class ActionModeController implements SelectionManager.Callback, ActionMode.Callback {
 
     private static final String TAG = "ActionModeController";
 
     private final Context mContext;
-    private final MultiSelectManager mSelectionMgr;
+    private final SelectionManager mSelectionMgr;
     private final MenuManager mMenuManager;
     private final MenuManager.SelectionDetails mSelectionDetails;
 
@@ -68,7 +69,7 @@
 
     private ActionModeController(
             Context context,
-            MultiSelectManager selectionMgr,
+            SelectionManager selectionMgr,
             MenuManager menuManager,
             MenuManager.SelectionDetails selectionDetails,
             Function<ActionMode.Callback, ActionMode> actionModeFactory,
@@ -151,8 +152,16 @@
     // Called when the user exits the action mode
     @Override
     public void onDestroyActionMode(ActionMode mode) {
+        if (mActionMode == null) {
+            if (DEBUG) Log.w(TAG, "Received call to destroy action mode on alien mode object.");
+        }
+
+        assert(mActionMode.equals(mode));
+
         if (DEBUG) Log.d(TAG, "Handling action mode destroyed.");
         mActionMode = null;
+        mMenu = null;
+
         // clear selection
         mSelectionMgr.clearSelection();
         mSelected.clear();
@@ -202,7 +211,7 @@
 
     static ActionModeController create(
             Context context,
-            MultiSelectManager selectionMgr,
+            SelectionManager selectionMgr,
             MenuManager menuManager,
             MenuManager.SelectionDetails selectionDetails,
             Activity activity,