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

Commit a30a0161 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update active gesture error detection" into tm-qpr-dev

parents 7fb1336d 0d8c5923

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

+4 −13
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_CANCELE 
import static com.android.quickstep.GestureState.STATE_RECENTS_SCROLLING_FINISHED;

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.EXPECTING_TASK_APPEARED;

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

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

import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
@@ -1704,10 +1704,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
    private void resumeLastTask() {

        if (mRecentsAnimationController != null) {

            mRecentsAnimationController.finish(false /* toRecents */, null);

            ActiveGestureLog.INSTANCE.addLog(

                    /* event= */ "finishRecentsAnimation",

                    /* extras= */ false,

                    /* gestureEvent= */ FINISH_RECENTS_ANIMATION);

        }

        doLogGesture(LAST_TASK, null);

        reset();
@@ -1916,10 +1912,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                mRecentsAnimationController.detachNavigationBarFromApp(true);

            }

        }

        ActiveGestureLog.INSTANCE.addLog(

                /* event= */ "finishRecentsAnimation",

                /* extras= */ true,

                /* gestureEvent= */ FINISH_RECENTS_ANIMATION);

    }



    private void finishCurrentTransitionToHome() {
@@ -1931,10 +1923,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
            finishRecentsControllerToHome(

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

        }

        ActiveGestureLog.INSTANCE.addLog(

                /* event= */ "finishRecentsAnimation",

                /* extras= */ true,

                /* gestureEvent= */ FINISH_RECENTS_ANIMATION);

        doLogGesture(HOME, mRecentsView == null ? null : mRecentsView.getCurrentPageTaskView());

    }
@@ -2045,6 +2033,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                mGestureState.updateLastStartedTaskId(taskId);

                boolean hasTaskPreviouslyAppeared = mGestureState.getPreviouslyAppearedTaskIds()

                        .contains(taskId);

                if (!hasTaskPreviouslyAppeared) {

                    ActiveGestureLog.INSTANCE.trackEvent(EXPECTING_TASK_APPEARED);

                }

                nextTask.launchTask(success -> {

                    resultCallback.accept(success);

                    if (success) {

quickstep/src/com/android/quickstep/GestureState.java

+0 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERV 
import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;

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

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

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

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



import android.annotation.Nullable;
@@ -341,8 +340,6 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL 
                ActiveGestureLog.INSTANCE.trackEvent(SET_END_TARGET_NEW_TASK);

                break;

            case LAST_TASK:

                ActiveGestureLog.INSTANCE.trackEvent(SET_END_TARGET_LAST_TASK);

                break;

            case RECENTS:

            default:

                // No-Op

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

+4 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ public class RecentsAnimationCallbacks implements 
    public final void onAnimationCanceled(HashMap<Integer, ThumbnailData> thumbnailDatas) {

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

            ActiveGestureLog.INSTANCE.addLog(

                    /* event= */ "onRecentsAnimationCancelled",

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

                    /* gestureEvent= */ CANCEL_RECENTS_ANIMATION);

            for (RecentsAnimationListener listener : getListeners()) {

                listener.onRecentsAnimationCanceled(thumbnailDatas);
@@ -142,7 +142,7 @@ public class RecentsAnimationCallbacks implements 
    @Override

    public void onTasksAppeared(RemoteAnimationTarget[] apps) {

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

            ActiveGestureLog.INSTANCE.addLog("onTasksAppeared",

            ActiveGestureLog.INSTANCE.addLog("RecentsAnimationCallbacks.onTasksAppeared",

                    ActiveGestureErrorDetector.GestureEvent.TASK_APPEARED);

            for (RecentsAnimationListener listener : getListeners()) {

                listener.onTasksAppeared(apps);
@@ -164,6 +164,8 @@ public class RecentsAnimationCallbacks implements 


    private final void onAnimationFinished(RecentsAnimationController controller) {

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

            ActiveGestureLog.INSTANCE.addLog(

                    /* event= */ "RecentsAnimationCallbacks.onAnimationFinished");

            for (RecentsAnimationListener listener : getListeners()) {

                listener.onRecentsAnimationFinished(controller);

            }

quickstep/src/com/android/quickstep/RecentsAnimationController.java

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.quickstep; 
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

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

import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;

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



import android.content.Context;

import android.os.RemoteException;
@@ -155,6 +156,10 @@ public class RecentsAnimationController { 
            mPendingFinishCallbacks.add(callback);

            return;

        }

        ActiveGestureLog.INSTANCE.addLog(

                /* event= */ "finishRecentsAnimation",

                /* extras= */ toRecents,

                /* gestureEvent= */ FINISH_RECENTS_ANIMATION);



        // Finish not yet requested

        mFinishRequested = true;

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

+9 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; 
import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_INITIALIZED;

import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_STARTED;

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

import static com.android.systemui.shared.system.RemoteTransitionCompat.newRemoteTransition;



import android.app.ActivityManager;
@@ -38,6 +39,7 @@ 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.ActiveGestureLog;

import com.android.quickstep.views.RecentsView;

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

import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -101,6 +103,9 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn 
    @UiThread

    public RecentsAnimationCallbacks startRecentsAnimation(GestureState gestureState,

            Intent intent, RecentsAnimationCallbacks.RecentsAnimationListener listener) {

        ActiveGestureLog.INSTANCE.addLog(

                /* event= */ "startRecentsAnimation",

                /* gestureEvent= */ START_RECENTS_ANIMATION);

        // Notify if recents animation is still running

        if (mController != null) {

            String msg = "New recents animation started before old animation completed";
@@ -250,6 +255,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn 
     * Continues the existing running recents animation for a new gesture.

     */

    public RecentsAnimationCallbacks continueRecentsAnimation(GestureState gestureState) {

        ActiveGestureLog.INSTANCE.addLog(/* event= */ "continueRecentsAnimation");

        mCallbacks.removeListener(mLastGestureState);

        mLastGestureState = gestureState;

        mCallbacks.addListener(gestureState);
@@ -288,6 +294,8 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn 
     */

    public void finishRunningRecentsAnimation(boolean toHome) {

        if (mController != null) {

            ActiveGestureLog.INSTANCE.addLog(

                    /* event= */ "finishRunningRecentsAnimation", toHome);

            mCallbacks.notifyAnimationCanceled();

            Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(), toHome

                    ? mController::finishAnimationToHome
@@ -320,6 +328,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn 
     * Cleans up the recents animation entirely.

     */

    private void cleanUpRecentsAnimation() {

        ActiveGestureLog.INSTANCE.addLog(/* event= */ "cleanUpRecentsAnimation");

        if (mLiveTileCleanUpHandler != null) {

            mLiveTileCleanUpHandler.run();

            mLiveTileCleanUpHandler = null;