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

Commit 54fa8131 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9075033 from 455c942f to tm-qpr1-release 

Change-Id: I5f91680b6970789cd7b1cd95efedb955380068cf
parents f76d42cb 455c942f

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+3 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ import com.android.launcher3.util.RunnableList; 
import com.android.launcher3.util.SafeCloseable;

import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;

import com.android.launcher3.util.TouchController;

import com.android.launcher3.util.ViewCapture;

import com.android.launcher3.widget.LauncherAppWidgetHost;

import com.android.quickstep.OverviewCommandHelper;

import com.android.quickstep.RecentsModel;
@@ -135,6 +134,7 @@ import com.android.quickstep.util.RemoteAnimationProvider; 
import com.android.quickstep.util.RemoteFadeOutAnimationListener;

import com.android.quickstep.util.SplitSelectStateController;

import com.android.quickstep.util.TISBindHelper;

import com.android.quickstep.util.ViewCapture;

import com.android.quickstep.views.OverviewActionsView;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;
@@ -586,6 +586,8 @@ public class QuickstepLauncher extends Launcher { 
    public void onWidgetsTransition(float progress) {

        super.onWidgetsTransition(progress);

        onTaskbarInAppDisplayProgressUpdate(progress, WIDGETS_PAGE_PROGRESS_INDEX);

        // Change of wallpaper depth in widget picker is disabled for tests as it causes flakiness

        // on very slow cuttlefish devices.

        if (ENABLE_WIDGET_PICKER_DEPTH.get() && !Utilities.IS_RUNNING_IN_TEST_HARNESS) {

            WIDGET_DEPTH.set(getDepthController(),

                    Utilities.mapToRange(progress, 0f, 1f, 0f, getDeviceProfile().bottomSheetDepth,

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+5 −5
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import static com.android.quickstep.MultiStateCallback.DEBUG_STATES; 
import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.CANCEL_RECENTS_ANIMATION;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.FINISH_RECENTS_ANIMATION;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.ON_SETTLED_ON_END_TARGET;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.START_RECENTS_ANIMATION;

import static com.android.quickstep.util.VibratorWrapper.OVERVIEW_HAPTIC;

import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
@@ -827,10 +826,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
    public void onRecentsAnimationStart(RecentsAnimationController controller,

            RecentsAnimationTargets targets) {

        super.onRecentsAnimationStart(controller, targets);

        ActiveGestureLog.INSTANCE.addLog(

                /* event= */ "startRecentsAnimationCallback",

                /* extras= */ targets.apps.length,

                /* gestureEvent= */ START_RECENTS_ANIMATION);

        mRemoteTargetHandles = mTargetGluer.assignTargetsForSplitScreen(mContext, targets);

        mRecentsAnimationController = controller;

        mRecentsAnimationTargets = targets;
@@ -1449,6 +1444,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
        }

    }



    @Nullable

    private SwipePipToHomeAnimator createWindowAnimationToPip(HomeAnimationFactory homeAnimFactory,

            RemoteAnimationTargetCompat runningTaskTarget, float startProgress) {

        // Directly animate the app to PiP (picture-in-picture) mode
@@ -1474,6 +1470,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                        runningTaskTarget.taskInfo.pictureInPictureParams,

                        homeRotation,

                        hotseatKeepClearArea);

        if (destinationBounds == null) {

            // No destination bounds returned from SystemUI, bail early.

            return null;

        }

        final Rect appBounds = new Rect();

        final WindowConfiguration winConfig = taskInfo.configuration.windowConfiguration;

        // Adjust the appBounds for TaskBar by using the calculated window crop Rect

quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java

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


import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.CANCEL_RECENTS_ANIMATION;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.START_RECENTS_ANIMATION;



import android.graphics.Rect;

import android.util.ArraySet;
@@ -114,6 +115,10 @@ public class RecentsAnimationCallbacks implements 
                    homeContentInsets, minimizedHomeBounds);



            Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(), () -> {

                ActiveGestureLog.INSTANCE.addLog(

                        /* event= */ "RecentsAnimationCallbacks.onAnimationStart",

                        /* extras= */ targets.apps.length,

                        /* gestureEvent= */ START_RECENTS_ANIMATION);

                for (RecentsAnimationListener listener : getListeners()) {

                    listener.onRecentsAnimationStart(mController, targets);

                }

quickstep/src/com/android/quickstep/SystemUiProxy.java

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.view.RemoteAnimationTarget; 
import android.view.SurfaceControl;

import android.window.IOnBackInvokedCallback;



import androidx.annotation.Nullable;

import androidx.annotation.WorkerThread;



import com.android.internal.logging.InstanceId;
@@ -481,6 +482,10 @@ public class SystemUiProxy implements ISystemUiProxy { 
        mPipAnimationListener = listener;

    }



    /**

     * @return Destination bounds of auto-pip animation, {@code null} if the animation is not ready.

     */

    @Nullable

    public Rect startSwipePipToHome(ComponentName componentName, ActivityInfo activityInfo,

            PictureInPictureParams pictureInPictureParams, int launcherRotation,

            Rect hotseatKeepClearArea) {

quickstep/src/com/android/quickstep/TaskAnimationManager.java

+0 −4
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ import androidx.annotation.UiThread; 
import com.android.launcher3.Utilities;

import com.android.launcher3.config.FeatureFlags;

import com.android.quickstep.TopTaskTracker.CachedTaskInfo;

import com.android.quickstep.util.ActiveGestureErrorDetector;

import com.android.quickstep.util.ActiveGestureLog;

import com.android.quickstep.views.RecentsView;

import com.android.systemui.shared.recents.model.ThumbnailData;

import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -137,8 +135,6 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn 
                    // handling this call entirely

                    return;

                }

                ActiveGestureLog.INSTANCE.addLog("TaskAnimationManager.startRecentsAnimation",

                        ActiveGestureErrorDetector.GestureEvent.START_RECENTS_ANIMATION);

                mController = controller;

                mTargets = targets;

                mLastAppearedTaskTarget = mTargets.findTask(mLastGestureState.getRunningTaskId());