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

Commit 11a04548 authored by Xin Li's avatar Xin Li
Browse files

Merge SP2A.220305.012 

Bug: 219523960
Merged-In: I51cb81718a489ad7568c5e05ace0b3dbc6ca5443
Change-Id: Icf0cc432ab3a97614b27efcf6fc9d18ea423a743
parents bbd9e79b af3034c3

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

+16 −0
Original line number Diff line number Diff line
@@ -220,6 +220,22 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn 
        return mCallbacks;

    }



    public void endLiveTile() {

        if (mLastGestureState == null) {

            return;

        }

        BaseActivityInterface activityInterface = mLastGestureState.getActivityInterface();

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

                && activityInterface.getCreatedActivity() != null) {

            RecentsView recentsView = activityInterface.getCreatedActivity().getOverviewPanel();

            if (recentsView != null) {

                recentsView.switchToScreenshot(null,

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

                                false /* shouldPip */, null));

            }

        }

    }



    public void setLiveTileCleanUpHandler(Runnable cleanUpHandler) {

        mLiveTileCleanUpHandler = cleanUpHandler;

    }

quickstep/src/com/android/quickstep/TouchInteractionService.java

+10 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHE 
import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_STARTING_WINDOW;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SMARTSPACE_TRANSITION_CONTROLLER;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;



import android.annotation.TargetApi;
@@ -495,6 +496,15 @@ public class TouchInteractionService extends Service 
            mOverviewComponentObserver.onSystemUiStateChanged();

            mTaskbarManager.onSystemUiFlagsChanged(systemUiStateFlags);



            boolean wasExpanded = (lastSysUIFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) != 0;

            boolean isExpanded =

                    (systemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) != 0;

            if (wasExpanded != isExpanded && isExpanded) {

                // End live tile when expanding the notification panel for the first time from

                // overview.

                mTaskAnimationManager.endLiveTile();

            }



            if ((lastSysUIFlags & SYSUI_STATE_TRACING_ENABLED) !=

                    (systemUiStateFlags & SYSUI_STATE_TRACING_ENABLED)) {

                // Update the tracing state