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

Commit b2d7f05b authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Remove ENABLE_QUICKSTEP_LIVE_TILE flag" into tm-qpr-dev am: d7a7bfc3 am: b2cd75e5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20079254



Change-Id: Id23f4091da4d7216de27615c7e97f7139a37d392
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16403d43 b2cd75e5

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

+2 −5
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK; 
import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;

import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;

import static com.android.launcher3.anim.Interpolators.EMPHASIZED;

import static com.android.launcher3.anim.Interpolators.EMPHASIZED;

import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;

import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent;

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.config.FeatureFlags.ENABLE_SPLIT_FROM_WORKSPACE;

import static com.android.launcher3.config.FeatureFlags.ENABLE_SPLIT_FROM_WORKSPACE;

import static com.android.launcher3.config.FeatureFlags.ENABLE_WIDGET_PICKER_DEPTH;

import static com.android.launcher3.config.FeatureFlags.ENABLE_WIDGET_PICKER_DEPTH;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP;
@@ -559,11 +558,9 @@ public class QuickstepLauncher extends Launcher { 
    @Override

    @Override

    protected void onScreenOff() {

    protected void onScreenOff() {

        super.onScreenOff();

        super.onScreenOff();

        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {

        RecentsView recentsView = getOverviewPanel();

        RecentsView recentsView = getOverviewPanel();

        recentsView.finishRecentsAnimation(true /* toRecents */, null);

        recentsView.finishRecentsAnimation(true /* toRecents */, null);

    }

    }

    }





    /**

    /**

     * {@code LauncherOverlayCallbacks} scroll amount.

     * {@code LauncherOverlayCallbacks} scroll amount.

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java

+4 −9
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS 
import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PULL_BACK_TRANSLATION;

import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PULL_BACK_TRANSLATION;

import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;

import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;

import static com.android.launcher3.anim.Interpolators.DEACCEL_3;

import static com.android.launcher3.anim.Interpolators.DEACCEL_3;

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
@@ -139,9 +138,7 @@ public class NavBarToHomeTouchController implements TouchController, 
            AnimatorControllerWithResistance.createRecentsResistanceFromOverviewAnim(mLauncher,

            AnimatorControllerWithResistance.createRecentsResistanceFromOverviewAnim(mLauncher,

                    builder);

                    builder);





            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {

            builder.addOnFrameCallback(recentsView::redrawLiveTile);

            builder.addOnFrameCallback(recentsView::redrawLiveTile);

            }





            AbstractFloatingView.closeOpenContainer(mLauncher, AbstractFloatingView.TYPE_TASK_MENU);

            AbstractFloatingView.closeOpenContainer(mLauncher, AbstractFloatingView.TYPE_TASK_MENU);

        } else if (mStartState == ALL_APPS) {

        } else if (mStartState == ALL_APPS) {
@@ -182,11 +179,9 @@ public class NavBarToHomeTouchController implements TouchController, 
        boolean success = interpolatedProgress >= SUCCESS_TRANSITION_PROGRESS

        boolean success = interpolatedProgress >= SUCCESS_TRANSITION_PROGRESS

                || (velocity < 0 && fling);

                || (velocity < 0 && fling);

        if (success) {

        if (success) {

            if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {

            RecentsView recentsView = mLauncher.getOverviewPanel();

            RecentsView recentsView = mLauncher.getOverviewPanel();

            recentsView.switchToScreenshot(null,

            recentsView.switchToScreenshot(null,

                    () -> recentsView.finishRecentsAnimation(true /* toRecents */, null));

                    () -> recentsView.finishRecentsAnimation(true /* toRecents */, null));

            }

            if (mStartState.overviewUi) {

            if (mStartState.overviewUi) {

                new OverviewToHomeAnim(mLauncher, () -> onSwipeInteractionCompleted(mEndState))

                new OverviewToHomeAnim(mLauncher, () -> onSwipeInteractionCompleted(mEndState))

                        .animateWithVelocity(velocity);

                        .animateWithVelocity(velocity);

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

+15 −42
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ import static com.android.launcher3.PagedView.INVALID_PAGE; 
import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;

import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;

import static com.android.launcher3.anim.Interpolators.DEACCEL;

import static com.android.launcher3.anim.Interpolators.DEACCEL;

import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;

import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;

import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.IGNORE;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
@@ -400,12 +399,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                this::resetStateForAnimationCancel);

                this::resetStateForAnimationCancel);

        mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED | STATE_FINISH_WITH_NO_END,

        mStateCallback.runOnceAtState(STATE_HANDLER_INVALIDATED | STATE_FINISH_WITH_NO_END,

                this::resetStateForAnimationCancel);

                this::resetStateForAnimationCancel);



        if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {

            mStateCallback.addChangeListener(STATE_APP_CONTROLLER_RECEIVED | STATE_LAUNCHER_PRESENT

                            | STATE_SCREENSHOT_VIEW_SHOWN | STATE_CAPTURE_SCREENSHOT,

                    (b) -> mRecentsView.setRunningTaskHidden(!b));

        }

    }

    }





    protected boolean onActivityInit(Boolean alreadyOnHome) {

    protected boolean onActivityInit(Boolean alreadyOnHome) {
@@ -583,14 +576,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
    }

    }





    private void onDeferredActivityLaunch() {

    private void onDeferredActivityLaunch() {

        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {

        mActivityInterface.switchRunningTaskViewToScreenshot(

        mActivityInterface.switchRunningTaskViewToScreenshot(

                null, () -> {

                null, () -> {

                    mTaskAnimationManager.finishRunningRecentsAnimation(true /* toHome */);

                    mTaskAnimationManager.finishRunningRecentsAnimation(true /* toHome */);

                });

                });

        } else {

            mTaskAnimationManager.finishRunningRecentsAnimation(true /* toHome */);

        }

    }

    }





    private void setupRecentsViewUi() {

    private void setupRecentsViewUi() {
@@ -1719,8 +1708,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
    }

    }





    private void invalidateHandler() {

    private void invalidateHandler() {

        if (!ENABLE_QUICKSTEP_LIVE_TILE.get() || !mActivityInterface.isInLiveTileMode()

        if (!mActivityInterface.isInLiveTileMode() || mGestureState.getEndTarget() != RECENTS) {

                || mGestureState.getEndTarget() != RECENTS) {

            mInputConsumerProxy.destroy();

            mInputConsumerProxy.destroy();

            mTaskAnimationManager.setLiveTileCleanUpHandler(null);

            mTaskAnimationManager.setLiveTileCleanUpHandler(null);

        }

        }
@@ -1765,10 +1753,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
     * continued quick switch gesture, which cancels the previous handler but doesn't invalidate it.

     * continued quick switch gesture, which cancels the previous handler but doesn't invalidate it.

     */

     */

    private void resetLauncherListeners() {

    private void resetLauncherListeners() {

        // Reset the callback for deferred activity launches

        if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {

            mActivityInterface.setOnDeferredActivityLaunchCallback(null);

        }

        mActivity.getRootView().setOnApplyWindowInsetsListener(null);

        mActivity.getRootView().setOnApplyWindowInsetsListener(null);





        mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener);

        mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener);
@@ -1790,7 +1774,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
            mStateCallback.setStateOnUiThread(STATE_SCREENSHOT_CAPTURED);

            mStateCallback.setStateOnUiThread(STATE_SCREENSHOT_CAPTURED);

        } else {

        } else {

            final int runningTaskId = mGestureState.getRunningTaskId();

            final int runningTaskId = mGestureState.getRunningTaskId();

            final boolean refreshView = !ENABLE_QUICKSTEP_LIVE_TILE.get() /* refreshView */;

            boolean finishTransitionPosted = false;

            boolean finishTransitionPosted = false;

            if (mRecentsAnimationController != null) {

            if (mRecentsAnimationController != null) {

                // Update the screenshot of the task

                // Update the screenshot of the task
@@ -1801,14 +1784,14 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                                mRecentsAnimationController.screenshotTask(runningTaskId);

                                mRecentsAnimationController.screenshotTask(runningTaskId);

                        MAIN_EXECUTOR.execute(() -> {

                        MAIN_EXECUTOR.execute(() -> {

                            mTaskSnapshot = taskSnapshot;

                            mTaskSnapshot = taskSnapshot;

                            if (!updateThumbnail(runningTaskId, refreshView)) {

                            if (!updateThumbnail(runningTaskId, false /* refreshView */)) {

                                setScreenshotCapturedState();

                                setScreenshotCapturedState();

                            }

                            }

                        });

                        });

                    });

                    });

                    return;

                    return;

                }

                }

                finishTransitionPosted = updateThumbnail(runningTaskId, refreshView);

                finishTransitionPosted = updateThumbnail(runningTaskId, false /* refreshView */);

            }

            }

            if (!finishTransitionPosted) {

            if (!finishTransitionPosted) {

                setScreenshotCapturedState();

                setScreenshotCapturedState();
@@ -1846,18 +1829,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
    }

    }





    private void finishCurrentTransitionToRecents() {

    private void finishCurrentTransitionToRecents() {

        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {

        mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);

        mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);

        if (mRecentsAnimationController != null) {

        if (mRecentsAnimationController != null) {

            mRecentsAnimationController.detachNavigationBarFromApp(true);

            mRecentsAnimationController.detachNavigationBarFromApp(true);

        }

        }

        } else if (!hasTargets() || mRecentsAnimationController == null) {

            // If there are no targets or the animation not started, then there is nothing to finish

            mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);

        } else {

            mRecentsAnimationController.finish(true /* toRecents */,

                    () -> mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED));

        }

        ActiveGestureLog.INSTANCE.addLog(

        ActiveGestureLog.INSTANCE.addLog(

                /* event= */ "finishRecentsAnimation",

                /* event= */ "finishRecentsAnimation",

                /* extras= */ true,

                /* extras= */ true,
@@ -1920,13 +1895,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
        }

        }

        endLauncherTransitionController();

        endLauncherTransitionController();

        mRecentsView.onSwipeUpAnimationSuccess();

        mRecentsView.onSwipeUpAnimationSuccess();

        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {

        mTaskAnimationManager.setLiveTileCleanUpHandler(() -> {

        mTaskAnimationManager.setLiveTileCleanUpHandler(() -> {

            mRecentsView.cleanupRemoteTargets();

            mRecentsView.cleanupRemoteTargets();

            mInputConsumerProxy.destroy();

            mInputConsumerProxy.destroy();

        });

        });

        mTaskAnimationManager.enableLiveTileRestartListener();

        mTaskAnimationManager.enableLiveTileRestartListener();

        }





        SystemUiProxy.INSTANCE.get(mContext).onOverviewShown(false, TAG);

        SystemUiProxy.INSTANCE.get(mContext).onOverviewShown(false, TAG);

        doLogGesture(RECENTS, mRecentsView.getCurrentPageTaskView());

        doLogGesture(RECENTS, mRecentsView.getCurrentPageTaskView());

quickstep/src/com/android/quickstep/FallbackActivityInterface.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

 */

package com.android.quickstep;

package com.android.quickstep;





import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.util.NavigationMode.NO_BUTTON;

import static com.android.launcher3.util.NavigationMode.NO_BUTTON;

import static com.android.quickstep.fallback.RecentsState.BACKGROUND_APP;

import static com.android.quickstep.fallback.RecentsState.BACKGROUND_APP;

import static com.android.quickstep.fallback.RecentsState.DEFAULT;

import static com.android.quickstep.fallback.RecentsState.DEFAULT;
@@ -120,8 +119,7 @@ public final class FallbackActivityInterface extends 
    public RecentsView getVisibleRecentsView() {

    public RecentsView getVisibleRecentsView() {

        RecentsActivity activity = getCreatedActivity();

        RecentsActivity activity = getCreatedActivity();

        if (activity != null) {

        if (activity != null) {

            if (activity.hasBeenResumed()

            if (activity.hasBeenResumed() || isInLiveTileMode()) {

                    || (ENABLE_QUICKSTEP_LIVE_TILE.get() && isInLiveTileMode())) {

                return activity.getOverviewPanel();

                return activity.getOverviewPanel();

            }

            }

        }

        }

quickstep/src/com/android/quickstep/LauncherActivityInterface.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import static com.android.launcher3.LauncherState.OVERVIEW; 
import static com.android.launcher3.LauncherState.QUICK_SWITCH;

import static com.android.launcher3.LauncherState.QUICK_SWITCH;

import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;

import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;

import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

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

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





import android.animation.Animator;

import android.animation.Animator;
@@ -203,8 +202,7 @@ public final class LauncherActivityInterface extends 
    private Launcher getVisibleLauncher() {

    private Launcher getVisibleLauncher() {

        Launcher launcher = getCreatedActivity();

        Launcher launcher = getCreatedActivity();

        return (launcher != null) && launcher.isStarted()

        return (launcher != null) && launcher.isStarted()

                && ((ENABLE_QUICKSTEP_LIVE_TILE.get() && isInLiveTileMode())

                && (isInLiveTileMode() || launcher.hasBeenResumed()) ? launcher : null;

                || launcher.hasBeenResumed()) ? launcher : null;

    }

    }





    @Override

    @Override
@@ -213,7 +211,7 @@ public final class LauncherActivityInterface extends 
        if (launcher == null) {

        if (launcher == null) {

            return false;

            return false;

        }

        }

        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isInLiveTileMode()) {

        if (isInLiveTileMode()) {

            RecentsView recentsView = getVisibleRecentsView();

            RecentsView recentsView = getVisibleRecentsView();

            if (recentsView == null) {

            if (recentsView == null) {

                return false;

                return false;