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

Commit 670905b5 authored by Steve McKay's avatar Steve McKay Committed by android-build-merger
Browse files

Move selection to selection pkg, make activity scoped. 

am: 4f78ba64

Change-Id: I08ebc04f3f93c15a486cc89e077625c832b13bb5
parents 4e2fafa8 4f78ba64

src/com/android/documentsui/AbstractActionHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ import com.android.documentsui.base.State; 
import com.android.documentsui.dirlist.AnimationView.AnimationType;

import com.android.documentsui.dirlist.DocumentDetails;

import com.android.documentsui.dirlist.Model;

import com.android.documentsui.dirlist.MultiSelectManager.Selection;

import com.android.documentsui.files.LauncherActivity;

import com.android.documentsui.files.OpenUriForViewTask;

import com.android.documentsui.roots.LoadRootTask;

import com.android.documentsui.roots.RootsAccess;

import com.android.documentsui.selection.Selection;

import com.android.documentsui.sidebar.EjectRootTask;



import java.util.List;

src/com/android/documentsui/ActionHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.android.documentsui.base.DocumentStack; 
import com.android.documentsui.base.RootInfo;

import com.android.documentsui.dirlist.DocumentDetails;

import com.android.documentsui.dirlist.Model;

import com.android.documentsui.dirlist.MultiSelectManager.Selection;

import com.android.documentsui.selection.Selection;



public interface ActionHandler {

src/com/android/documentsui/BaseActivity.java

+19 −9
Original line number Diff line number Diff line
@@ -64,11 +64,13 @@ import com.android.documentsui.base.State; 
import com.android.documentsui.base.State.ViewMode;

import com.android.documentsui.dirlist.AnimationView;

import com.android.documentsui.dirlist.DirectoryFragment;

import com.android.documentsui.dirlist.DocumentsAdapter;

import com.android.documentsui.dirlist.Model;

import com.android.documentsui.dirlist.MultiSelectManager;

import com.android.documentsui.dirlist.MultiSelectManager.Selection;

import com.android.documentsui.roots.GetRootDocumentTask;

import com.android.documentsui.roots.RootsCache;

import com.android.documentsui.selection.SelectionManager;

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

import com.android.documentsui.selection.Selection;

import com.android.documentsui.sidebar.RootsFragment;

import com.android.documentsui.sorting.SortController;

import com.android.documentsui.sorting.SortModel;
@@ -96,7 +98,8 @@ public abstract class BaseActivity 
    protected SortController mSortController;



    private final String mTag;

    private final ContentObserver mRootsCacheObserver = new ContentObserver(new Handler()) {

    private final ContentObserver mRootsCacheObserver = new ContentObserver(

            new Handler()) {

                @Override

                public void onChange(boolean selfChange) {

                    new HandleRootsChangedTask(BaseActivity.this).execute(getCurrentRoot());
@@ -121,6 +124,13 @@ public abstract class BaseActivity 
     */

    public abstract ActivityConfig getActivityConfig();



    /**

     * Provides Activity a means of injection into and specialization of

     * DirectoryFragment.

     */

    public abstract SelectionManager getSelectionManager(

            DocumentsAdapter adapter, SelectionPredicate canSetState);



    /**

     * Provides Activity a means of injection into and specialization of

     * DirectoryFragment.
@@ -146,7 +156,7 @@ public abstract class BaseActivity 
     * Args can be null when called from a context lacking fragment, such as RootsFragment.

     */

    public abstract ActionHandler getActionHandler(

            @Nullable Model model, @Nullable MultiSelectManager selectionMgr, boolean searchMode);

            @Nullable Model model, @Nullable SelectionManager selectionMgr, boolean searchMode);



    public BaseActivity(@LayoutRes int layoutId, String tag) {

        mLayoutId = layoutId;

src/com/android/documentsui/MenuManager.java

+0 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.documentsui;



import android.app.Fragment;

import android.view.KeyboardShortcutGroup;

import android.view.Menu;

import android.view.MenuInflater;

import android.view.MenuItem;
@@ -33,9 +32,6 @@ import com.android.documentsui.dirlist.DirectoryFragment; 
import com.android.documentsui.sidebar.RootsFragment;

import com.android.internal.annotations.VisibleForTesting;



import java.util.List;

import java.util.function.IntFunction;



public abstract class MenuManager {



    final protected SearchViewManager mSearchManager;

src/com/android/documentsui/clipping/DocumentClipper.java

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import com.android.documentsui.base.DocumentInfo; 
import com.android.documentsui.base.DocumentStack;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.base.Shared;

import com.android.documentsui.dirlist.MultiSelectManager.Selection;

import com.android.documentsui.selection.Selection;

import com.android.documentsui.services.FileOperation;

import com.android.documentsui.services.FileOperationService;

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