Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0aa72075 authored by Steve McKay's avatar Steve McKay
Browse files

Selection code isolation. 

Collapse the "addons" package into it's parent since
   it doesn't have a distinct role.
Eliminate remaining testing deps on non-selection code.

Bug: 64847011
Test: Passing.
Change-Id: I60260777b6fc55df78a523b82f5c40a39490ace1
parent 6373bfda

src/com/android/documentsui/AbstractActionHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -57,10 +57,10 @@ import com.android.documentsui.queries.SearchViewManager; 
import com.android.documentsui.roots.GetRootDocumentTask;

import com.android.documentsui.roots.LoadRootTask;

import com.android.documentsui.roots.ProvidersAccess;

import com.android.documentsui.selection.ContentLock;

import com.android.documentsui.selection.MutableSelection;

import com.android.documentsui.selection.SelectionHelper;

import com.android.documentsui.selection.addons.ContentLock;

import com.android.documentsui.selection.addons.ItemDetailsLookup.ItemDetails;

import com.android.documentsui.selection.ItemDetailsLookup.ItemDetails;

import com.android.documentsui.sidebar.EjectRootTask;

import com.android.documentsui.ui.Snackbars;

src/com/android/documentsui/ActionHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ import com.android.documentsui.base.BooleanConsumer; 
import com.android.documentsui.base.DocumentInfo;

import com.android.documentsui.base.DocumentStack;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.selection.addons.ContentLock;

import com.android.documentsui.selection.addons.ItemDetailsLookup.ItemDetails;

import com.android.documentsui.selection.ContentLock;

import com.android.documentsui.selection.ItemDetailsLookup.ItemDetails;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

src/com/android/documentsui/DirectoryLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.documentsui.base.FilteringCursorWrapper; 
import com.android.documentsui.base.Lookup;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.roots.RootCursorWrapper;

import com.android.documentsui.selection.addons.ContentLock;

import com.android.documentsui.selection.ContentLock;

import com.android.documentsui.sorting.SortModel;



import libcore.io.IoUtils;

src/com/android/documentsui/Injector.java

+3 −3
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ import com.android.documentsui.dirlist.DocsStableIdProvider; 
import com.android.documentsui.dirlist.DocumentsAdapter;

import com.android.documentsui.prefs.ScopedPreferences;

import com.android.documentsui.queries.SearchViewManager;

import com.android.documentsui.selection.ContentLock;

import com.android.documentsui.selection.SelectionHelper;

import com.android.documentsui.selection.addons.ContentLock;

import com.android.documentsui.ui.DialogController;

import com.android.documentsui.ui.MessageBuilder;

import com.android.internal.annotations.VisibleForTesting;
@@ -134,8 +134,8 @@ public class Injector<T extends ActionHandler> { 
     * Obtains action handler and resets it if necessary.

     *

     * @param contentLock the lock held by

     *            {@link com.android.documentsui.selection.addons.BandSelectionHelper} and

     *            {@link com.android.documentsui.selection.addons.GestureSelectionHelper} to prevent

     *            {@link com.android.documentsui.selection.BandSelectionHelper} and

     *            {@link com.android.documentsui.selection.GestureSelectionHelper} to prevent

     *            loader from updating result during band/gesture selection. May be {@code null} if

     *            called from {@link com.android.documentsui.sidebar.RootsFragment}.

     * @return the action handler

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

+12 −13
Original line number Diff line number Diff line
@@ -86,22 +86,21 @@ import com.android.documentsui.clipping.DocumentClipper; 
import com.android.documentsui.clipping.UrisSupplier;

import com.android.documentsui.dirlist.AnimationView.AnimationType;

import com.android.documentsui.picker.PickActivity;

import com.android.documentsui.selection.BandPredicate;

import com.android.documentsui.selection.BandSelectionHelper;

import com.android.documentsui.selection.ContentLock;

import com.android.documentsui.selection.DefaultBandHost;

import com.android.documentsui.selection.DefaultBandPredicate;

import com.android.documentsui.selection.GestureRouter;

import com.android.documentsui.selection.GestureSelectionHelper;

import com.android.documentsui.selection.ItemDetailsLookup;

import com.android.documentsui.selection.MotionInputHandler;

import com.android.documentsui.selection.MouseInputHandler;

import com.android.documentsui.selection.Selection;

import com.android.documentsui.selection.SelectionHelper;

import com.android.documentsui.selection.TouchEventRouter;

import com.android.documentsui.selection.TouchInputHandler;

import com.android.documentsui.selection.SelectionHelper.SelectionPredicate;

import com.android.documentsui.selection.addons.BandPredicate;

import com.android.documentsui.selection.addons.BandSelectionHelper;

import com.android.documentsui.selection.addons.ContentLock;

import com.android.documentsui.selection.addons.DefaultBandHost;

import com.android.documentsui.selection.addons.DefaultBandPredicate;

import com.android.documentsui.selection.addons.GestureRouter;

import com.android.documentsui.selection.addons.GestureSelectionHelper;

import com.android.documentsui.selection.addons.ItemDetailsLookup;

import com.android.documentsui.selection.addons.KeyInputHandler;

import com.android.documentsui.selection.addons.MotionInputHandler;

import com.android.documentsui.selection.addons.MouseInputHandler;

import com.android.documentsui.selection.addons.TouchEventRouter;

import com.android.documentsui.selection.addons.TouchInputHandler;

import com.android.documentsui.services.FileOperation;

import com.android.documentsui.services.FileOperationService;

import com.android.documentsui.services.FileOperationService.OpType;