Merge "Removing tracing for a fixed bug" into ub-launcher3-rvc-dev (62d493d5) · Commits · e / os / android_packages_apps_Trebuchet

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

+0 −15

Original line number	Diff line number	Diff line
		@@ -299,9 +299,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
		if (mInputEventReceiver != null) {
		mInputEventReceiver.dispose();
		mInputEventReceiver = null;
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_BACKGROUND_TO_OVERVIEW_TAG, "disposeEventHandlers");
		}
		}
		if (mInputMonitorCompat != null) {
		mInputMonitorCompat.dispose();
		@@ -310,25 +307,16 @@ public class TouchInteractionService extends Service implements PluginListener<O
		}

		private void initInputMonitor() {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_BACKGROUND_TO_OVERVIEW_TAG, "initInputMonitor 1");
		}
		disposeEventHandlers();
		if (mDeviceState.isButtonNavMode() \|\| !SystemUiProxy.INSTANCE.get(this).isActive()) {
		return;
		}
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_BACKGROUND_TO_OVERVIEW_TAG, "initInputMonitor 2");
		}

		Bundle bundle = SystemUiProxy.INSTANCE.get(this).monitorGestureInput("swipe-up",
		mDeviceState.getDisplayId());
		mInputMonitorCompat = InputMonitorCompat.fromBundle(bundle, KEY_EXTRA_INPUT_MONITOR);
		mInputEventReceiver = mInputMonitorCompat.getInputReceiver(Looper.getMainLooper(),
		mMainChoreographer, this::onInputEvent);
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_BACKGROUND_TO_OVERVIEW_TAG, "initInputMonitor 3");
		}

		mDeviceState.updateGestureTouchRegions();
		}
		@@ -453,9 +441,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
		}

		private void onInputEvent(InputEvent ev) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_BACKGROUND_TO_OVERVIEW_TAG, "onInputEvent " + ev);
		}
		if (!(ev instanceof MotionEvent)) {
		Log.e(TAG, "Unknown event " + ev);
		return;

quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -215,9 +215,6 @@ public class RecentsAnimationDeviceState implements

		@Override
		public void onNavigationModeChanged(SysUINavigationMode.Mode newMode) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_BACKGROUND_TO_OVERVIEW_TAG, "onNavigationModeChanged " + newMode);
		}
		mDefaultDisplay.removeChangeListener(this);
		if (newMode.hasGestures) {
		mDefaultDisplay.addChangeListener(this);

src/com/android/launcher3/testing/TestProtocol.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -97,7 +97,6 @@ public final class TestProtocol {

		public static final String PERMANENT_DIAG_TAG = "TaplTarget";

		public static final String NO_BACKGROUND_TO_OVERVIEW_TAG = "b/138251824";
		public static final String APP_NOT_DISABLED = "b/139891609";
		public static final String NO_SCROLL_END_WIDGETS = "b/152354290";
		}