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

Commit c8f5434e authored by Jeremie Boulic's avatar Jeremie Boulic Committed by Android (Google) Code Review
Browse files

Merge "[DocsUI Peek] Expose Peek to the FilesActivity only" into main

parents 3b125ac1 ea336fa6

src/com/android/documentsui/BaseActivity.java

+1 −18
Original line number Diff line number Diff line
@@ -19,11 +19,10 @@ package com.android.documentsui; 
import static com.android.documentsui.base.Shared.EXTRA_BENCHMARK;

import static com.android.documentsui.base.SharedMinimal.DEBUG;

import static com.android.documentsui.base.State.MODE_GRID;

import static com.android.documentsui.util.FlagUtils.isSearchV2Enabled;

import static com.android.documentsui.util.FlagUtils.isUseMaterial3FlagEnabled;

import static com.android.documentsui.util.FlagUtils.isUsePeekPreviewFlagEnabled;

import static com.android.documentsui.util.FlagUtils.isVisualSignalsFlagEnabled;

import static com.android.documentsui.util.Material3Config.getRes;

import static com.android.documentsui.util.FlagUtils.isSearchV2Enabled;



import android.content.Context;

import android.content.Intent;
@@ -54,7 +53,6 @@ import androidx.appcompat.widget.ActionMenuView; 
import androidx.appcompat.widget.Toolbar;

import androidx.core.view.WindowInsetsCompat;

import androidx.fragment.app.Fragment;

import androidx.lifecycle.ViewModelProvider;



import com.android.documentsui.AbstractActionHandler.CommonAddons;

import com.android.documentsui.Injector.Injected;
@@ -70,8 +68,6 @@ import com.android.documentsui.base.UserId; 
import com.android.documentsui.dirlist.AnimationView;

import com.android.documentsui.dirlist.AppsRowManager;

import com.android.documentsui.dirlist.DirectoryFragment;

import com.android.documentsui.peek.PeekViewManager;

import com.android.documentsui.peek.PeekViewModel;

import com.android.documentsui.prefs.LocalPreferences;

import com.android.documentsui.prefs.PreferencesMonitor;

import com.android.documentsui.queries.CommandInterceptor;
@@ -103,7 +99,6 @@ public abstract class BaseActivity 


    protected SearchViewManager mSearchManager;

    protected AppsRowManager mAppsRowManager;

    protected @Nullable PeekViewManager mPeekViewManager;

    protected UserIdManager mUserIdManager;

    protected UserManagerState mUserManagerState;

    protected State mState;
@@ -438,18 +433,6 @@ public abstract class BaseActivity 
        // Base classes must update result in their onCreate.

        setResult(AppCompatActivity.RESULT_CANCELED);

        updateRecentsSetting();



        if (isUsePeekPreviewFlagEnabled()) {

            ViewModelProvider viewModelProvider = new ViewModelProvider(this);

            PeekViewModel viewModel = viewModelProvider.get(PeekViewModel.class);

            mPeekViewManager = new PeekViewManager(

                    viewModel,

                    findViewById(getRes(R.id.peek_overlay)),

                    getSupportFragmentManager());

            viewModel.getOverlayActive().observe(

                    this,

                    mPeekViewManager);

        }

    }



    private NavigationViewManager getNavigationViewManager(Breadcrumb breadcrumb,

src/com/android/documentsui/files/FilesActivity.java

+18 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.documentsui.files; 
import static com.android.documentsui.OperationDialogFragment.DIALOG_TYPE_UNKNOWN;

import static com.android.documentsui.base.SharedMinimal.DEBUG;

import static com.android.documentsui.util.FlagUtils.isUseMaterial3FlagEnabled;

import static com.android.documentsui.util.FlagUtils.isUsePeekPreviewFlagEnabled;

import static com.android.documentsui.util.FlagUtils.isVisualSignalsFlagEnabled;

import static com.android.documentsui.util.FlagUtils.isZipNgFlagEnabled;

import static com.android.documentsui.util.Material3Config.getRes;
@@ -67,6 +68,8 @@ import com.android.documentsui.clipping.DocumentClipper; 
import com.android.documentsui.dirlist.AnimationView.AnimationType;

import com.android.documentsui.dirlist.AppsRowManager;

import com.android.documentsui.dirlist.DirectoryFragment;

import com.android.documentsui.peek.PeekViewManager;

import com.android.documentsui.peek.PeekViewModel;

import com.android.documentsui.services.FileOperationService;

import com.android.documentsui.sidebar.RootsFragment;

import com.android.documentsui.ui.DialogController;
@@ -75,6 +78,8 @@ import com.android.documentsui.ui.MessageBuilder; 
import java.util.ArrayList;

import java.util.List;



import javax.annotation.Nullable;



/**

 * Standalone file management activity.

 */
@@ -86,6 +91,7 @@ public class FilesActivity extends BaseActivity implements AbstractActionHandler 
    private Injector<ActionHandler<FilesActivity>> mInjector;

    private ActivityInputHandler mActivityInputHandler;

    private SharedInputHandler mSharedInputHandler;

    private @Nullable PeekViewManager mPeekViewManager;

    private final ProfileTabsAddons mProfileTabsAddonsStub = new StubProfileTabsAddons();



    public FilesActivity() {
@@ -164,6 +170,18 @@ public class FilesActivity extends BaseActivity implements AbstractActionHandler 
                            mInjector.messages);

        }



        if (isUsePeekPreviewFlagEnabled()) {

            ViewModelProvider viewModelProvider = new ViewModelProvider(this);

            PeekViewModel viewModel = viewModelProvider.get(PeekViewModel.class);

            mPeekViewManager = new PeekViewManager(

                    viewModel,

                    findViewById(getRes(R.id.peek_overlay)),

                    getSupportFragmentManager());

            viewModel.getOverlayActive().observe(

                    this,

                    mPeekViewManager);

        }



        Runnable closeSelectionBarRunnable =

                (isUseMaterial3FlagEnabled()

                        ? mInjector.selectionBarController::closeSelectionBar