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

Commit d6801af6 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Inlining BaseQuickstepLauncher to QuickstepLauncher

Bug: 243022799
Test: Presubmit
Change-Id: I3706fc1f10d88ea73bd873c7e94c3e78795791eb
parent 831f5ee7
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ import android.os.Bundle;

import androidx.annotation.Nullable;

import com.android.launcher3.BaseQuickstepLauncher;
import com.android.launcher3.Launcher;
import com.android.launcher3.R;
import com.android.launcher3.taskbar.LauncherTaskbarUIController;
import com.android.launcher3.testing.DebugTestInformationHandler;
import com.android.launcher3.testing.shared.TestProtocol;
import com.android.launcher3.uioverrides.QuickstepLauncher;

import java.util.concurrent.ExecutionException;

@@ -64,7 +64,7 @@ public abstract class DebugQuickstepTestInformationHandler extends QuickstepTest
                runOnUIThread(l -> {
                    enableManualTaskbarStashing(l, true);

                    BaseQuickstepLauncher quickstepLauncher = (BaseQuickstepLauncher) l;
                    QuickstepLauncher quickstepLauncher = (QuickstepLauncher) l;
                    LauncherTaskbarUIController taskbarUIController =
                            quickstepLauncher.getTaskbarUIController();

@@ -90,7 +90,7 @@ public abstract class DebugQuickstepTestInformationHandler extends QuickstepTest
    }

    private void enableManualTaskbarStashing(Launcher launcher, boolean enable) {
        BaseQuickstepLauncher quickstepLauncher = (BaseQuickstepLauncher) launcher;
        QuickstepLauncher quickstepLauncher = (QuickstepLauncher) launcher;
        LauncherTaskbarUIController taskbarUIController =
                quickstepLauncher.getTaskbarUIController();

+0 −708

File deleted.

Preview size limit exceeded, changes collapsed.

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.TargetApi;
import android.os.Build;
import android.os.CancellationSignal;

import com.android.launcher3.uioverrides.QuickstepLauncher;
import com.android.quickstep.util.ActivityInitListener;
import com.android.quickstep.util.RemoteAnimationProvider;
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
@@ -44,7 +45,7 @@ public class LauncherInitListener extends ActivityInitListener<Launcher> {
    public boolean handleInit(Launcher launcher, boolean alreadyOnHome) {
        if (mRemoteAnimationProvider != null) {
            QuickstepTransitionManager appTransitionManager =
                    ((BaseQuickstepLauncher) launcher).getAppTransitionManager();
                    ((QuickstepLauncher) launcher).getAppTransitionManager();

            // Set a one-time animation provider. After the first call, this will get cleared.
            // TODO: Probably also check the intended target id.
+2 −1
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ import com.android.launcher3.statehandlers.DepthController;
import com.android.launcher3.taskbar.LauncherTaskbarUIController;
import com.android.launcher3.testing.shared.ResourceUtils;
import com.android.launcher3.touch.PagedOrientationHandler;
import com.android.launcher3.uioverrides.QuickstepLauncher;
import com.android.launcher3.util.ActivityOptionsWrapper;
import com.android.launcher3.util.DynamicResource;
import com.android.launcher3.util.ObjectWrapper;
@@ -193,7 +194,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
    // Cross-fade duration between App Widget and App
    private static final int WIDGET_CROSSFADE_DURATION_MILLIS = 125;

    protected final BaseQuickstepLauncher mLauncher;
    protected final QuickstepLauncher mLauncher;
    private final DragLayer mDragLayer;

    final Handler mHandler;
+4 −4
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ import android.os.UserHandle;
import android.util.Log;
import android.view.View;

import com.android.launcher3.BaseQuickstepLauncher;
import com.android.launcher3.model.data.ItemInfo;
import com.android.launcher3.model.data.WorkspaceItemInfo;
import com.android.launcher3.uioverrides.QuickstepLauncher;
import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
import com.android.quickstep.views.RecentsView;

@@ -33,18 +33,18 @@ public interface QuickstepSystemShortcut {

    String TAG = QuickstepSystemShortcut.class.getSimpleName();

    static SystemShortcut.Factory<BaseQuickstepLauncher> getSplitSelectShortcutByPosition(
    static SystemShortcut.Factory<QuickstepLauncher> getSplitSelectShortcutByPosition(
            SplitPositionOption position) {
        return (activity, itemInfo, originalView) ->
                new QuickstepSystemShortcut.SplitSelectSystemShortcut(activity, itemInfo,
                        originalView, position);
    }

    class SplitSelectSystemShortcut extends SystemShortcut<BaseQuickstepLauncher> {
    class SplitSelectSystemShortcut extends SystemShortcut<QuickstepLauncher> {

        private final SplitPositionOption mPosition;

        public SplitSelectSystemShortcut(BaseQuickstepLauncher launcher, ItemInfo itemInfo,
        public SplitSelectSystemShortcut(QuickstepLauncher launcher, ItemInfo itemInfo,
                View originalView, SplitPositionOption position) {
            super(position.iconResId, position.textResId, launcher, itemInfo, originalView);

Loading