Merge "Add debug logs to ActivityTracker" into main (b4d102e7) · Commits · e / os / BlissLauncher3

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -1002,7 +1002,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		ActiveGestureLog.INSTANCE.addLog(
		/* event= */ "cancelRecentsAnimation",
		/* gestureEvent= */ CANCEL_RECENTS_ANIMATION);
		mActivityInitListener.unregister();
		mActivityInitListener.unregister("AbsSwipeUpHandler.onRecentsAnimationCanceled");
		// Cache the recents animation controller so we can defer its cleanup to after having
		// properly cleaned up the screenshot without accidentally using it.
		mDeferredCleanupRecentsAnimationController = mRecentsAnimationController;
		@@ -1964,7 +1964,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,

		// Cleanup when switching handlers
		mInputConsumerProxy.unregisterOnTouchDownCallback();
		mActivityInitListener.unregister();
		mActivityInitListener.unregister("AbsSwipeUpHandler.cancelCurrentAnimation");
		TaskStackChangeListeners.getInstance().unregisterTaskStackListener(
		mActivityRestartListener);
		mTaskSnapshotCache.clear();
		@@ -1982,7 +1982,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		mGestureEndCallback.run();
		}

		mActivityInitListener.unregister();
		mActivityInitListener.unregister("AbsSwipeUpHandler.invalidateHandler");
		TaskStackChangeListeners.getInstance().unregisterTaskStackListener(
		mActivityRestartListener);
		mTaskSnapshotCache.clear();
		@@ -2486,11 +2486,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		/**
		* Registers a callback to run when the activity is ready.
		*/
		public void initWhenReady() {
		public void initWhenReady(String reasonString) {
		// Preload the plan
		RecentsModel.INSTANCE.get(mContext).getTasks(null);

		mActivityInitListener.register();
		mActivityInitListener.register(reasonString);
		}

		private boolean shouldFadeOutTargetsForKeyboardQuickSwitch(

quickstep/src/com/android/quickstep/OverviewCommandHelper.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -310,7 +310,7 @@ public class OverviewCommandHelper {
		.newHandler(gestureState, cmd.createTime);
		interactionHandler.setGestureEndCallback(
		() -> onTransitionComplete(cmd, interactionHandler));
		interactionHandler.initWhenReady();
		interactionHandler.initWhenReady("OverviewCommandHelper: cmd.type=" + cmd.type);

		RecentsAnimationListener recentAnimListener = new RecentsAnimationListener() {
		@Override

quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -394,7 +394,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
		mInteractionHandler = mHandlerFactory.newHandler(mGestureState, touchTimeMs);
		mInteractionHandler.setGestureEndCallback(this::onInteractionGestureFinished);
		mMotionPauseDetector.setOnMotionPauseListener(mInteractionHandler.getMotionPauseListener());
		mInteractionHandler.initWhenReady();
		mInteractionHandler.initWhenReady(
		"OtherActivityInputConsumer.startTouchTrackingForWindowAnimation");

		if (mTaskAnimationManager.isRecentsAnimationRunning()) {
		mActiveCallbacks = mTaskAnimationManager.continueRecentsAnimation(mGestureState);

quickstep/src/com/android/quickstep/util/ActivityInitListener.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -57,16 +57,16 @@ public class ActivityInitListener<T extends BaseActivity> implements
		* Registers the activity-created listener. If the activity is already created, then the
		* callback provided in the constructor will be called synchronously.
		*/
		public void register() {
		public void register(String reasonString) {
		mIsRegistered = true;
		mActivityTracker.registerCallback(this);
		mActivityTracker.registerCallback(this, reasonString);
		}

		/**
		* After calling this, we won't {@link #init} even when the activity is ready.
		*/
		public void unregister() {
		mActivityTracker.unregisterCallback(this);
		public void unregister(String reasonString) {
		mActivityTracker.unregisterCallback(this, reasonString);
		mIsRegistered = false;
		mOnInitListener = null;
		}

src/com/android/launcher3/Launcher.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -2651,6 +2651,7 @@ public class Launcher extends StatefulActivity<LauncherState>

		mModel.dumpState(prefix, fd, writer, args);
		mOverlayManager.dump(prefix, writer);
		ACTIVITY_TRACKER.dump(prefix, writer);
		}

		/**