8.5/ Follow up to comments from previous CLs (9196cb11) · Commits · e / os / android_packages_apps_Trebuchet

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

+17 −10

Original line number	Diff line number	Diff line
		@@ -129,10 +129,11 @@ public class TouchInteractionService extends Service implements
		public void onInitialize(Bundle bundle) {
		ISystemUiProxy proxy = ISystemUiProxy.Stub.asInterface(
		bundle.getBinder(KEY_EXTRA_SYSUI_PROXY));
		MAIN_EXECUTOR.execute(() -> SystemUiProxy.INSTANCE.get(TouchInteractionService.this)
		.setProxy(proxy));
		MAIN_EXECUTOR.execute(TouchInteractionService.this::initInputMonitor);
		MAIN_EXECUTOR.execute(() -> preloadOverview(true /* fromInit */));
		MAIN_EXECUTOR.execute(() -> {
		SystemUiProxy.INSTANCE.get(TouchInteractionService.this).setProxy(proxy);
		TouchInteractionService.this.initInputMonitor();
		preloadOverview(true /* fromInit */);
		});
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.LAUNCHER_DIDNT_INITIALIZE, "TIS initialized");
		}
		@@ -169,15 +170,19 @@ public class TouchInteractionService extends Service implements
		@BinderThread
		@Override
		public void onAssistantAvailable(boolean available) {
		MAIN_EXECUTOR.execute(() -> mDeviceState.setAssistantAvailable(available));
		MAIN_EXECUTOR.execute(TouchInteractionService.this::onAssistantVisibilityChanged);
		MAIN_EXECUTOR.execute(() -> {
		mDeviceState.setAssistantAvailable(available);
		TouchInteractionService.this.onAssistantVisibilityChanged();
		});
		}

		@BinderThread
		@Override
		public void onAssistantVisibilityChanged(float visibility) {
		MAIN_EXECUTOR.execute(() -> mDeviceState.setAssistantVisibility(visibility));
		MAIN_EXECUTOR.execute(TouchInteractionService.this::onAssistantVisibilityChanged);
		MAIN_EXECUTOR.execute(() -> {
		mDeviceState.setAssistantVisibility(visibility);
		TouchInteractionService.this.onAssistantVisibilityChanged();
		});
		}

		@BinderThread
		@@ -199,8 +204,10 @@ public class TouchInteractionService extends Service implements

		@BinderThread
		public void onSystemUiStateChanged(int stateFlags) {
		MAIN_EXECUTOR.execute(() -> mDeviceState.setSystemUiFlags(stateFlags));
		MAIN_EXECUTOR.execute(TouchInteractionService.this::onSystemUiFlagsChanged);
		MAIN_EXECUTOR.execute(() -> {
		mDeviceState.setSystemUiFlags(stateFlags);
		TouchInteractionService.this.onSystemUiFlagsChanged();
		});
		}

		@BinderThread

quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -229,7 +229,8 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		GestureState gestureState, RunningTaskInfo runningTaskInfo, long touchTimeMs,
		OverviewComponentObserver overviewComponentObserver, boolean continuingLastGesture,
		InputConsumerController inputConsumer, RecentsModel recentsModel) {
		super(context, gestureState, overviewComponentObserver, recentsModel, inputConsumer, runningTaskInfo.id);
		super(context, gestureState, overviewComponentObserver, recentsModel, inputConsumer,
		runningTaskInfo.id);
		mDeviceState = deviceState;
		mGestureState = gestureState;
		mTouchTimeMs = touchTimeMs;

quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/FallbackNoButtonInputConsumer.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -434,6 +434,7 @@ public class FallbackNoButtonInputConsumer extends

		@Override
		public void onRecentsAnimationCanceled(ThumbnailData thumbnailData) {
		super.onRecentsAnimationCanceled(thumbnailData);
		mRecentsView.setRecentsAnimationTargets(null, null);
		setStateOnUiThread(STATE_HANDLER_INVALIDATED);
		}

quickstep/recents_ui_overrides/src/com/android/quickstep/util/ActiveGestureLog.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ public class ActiveGestureLog extends EventLogArray {
		*/
		public static final String INTENT_EXTRA_LOG_TRACE_ID = "INTENT_EXTRA_LOG_TRACE_ID";

		public ActiveGestureLog() {
		private ActiveGestureLog() {
		super("touch_interaction_log", 40);
		}
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ public class RecentsAnimationController {
		* currently being animated.
		*/
		public ThumbnailData screenshotTask(int taskId) {
		return mController != null ? mController.screenshotTask(taskId) : null;
		return mController.screenshotTask(taskId);
		}

		/**