Merge "Log InputConsumer name instead of type" into ub-launcher3-rvc-dev (260f52d4) · Commits · e / os / android_packages_apps_Trebuchet

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import static com.android.quickstep.GestureState.DEFAULT_STATE;
		import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_INPUT_MONITOR;
		import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;
		import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_ASSISTANT;

		import android.annotation.TargetApi;
		import android.app.ActivityManager;
		@@ -486,7 +485,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
		mConsumer.onConsumerAboutToBeSwitched();
		mConsumer = newConsumer(prevGestureState, newGestureState, event);

		ActiveGestureLog.INSTANCE.addLog("setInputConsumer", mConsumer.getType());
		ActiveGestureLog.INSTANCE.addLog("setInputConsumer: " + mConsumer.getName());
		mUncheckedConsumer = mConsumer;
		} else if (mDeviceState.isUserUnlocked()
		&& mDeviceState.isFullyGesturalNavMode()

+4 −4

Original line number	Diff line number	Diff line
		@@ -96,15 +96,15 @@ public interface InputConsumer {
		}

		default String getName() {
		String name = "";
		StringBuilder name = new StringBuilder();
		for (int i = 0; i < NAMES.length; i++) {
		if ((getType() & (1 << i)) != 0) {
		if (name.length() > 0) {
		name += ":";
		name.append(":");
		}
		name += NAMES[i];
		name.append(NAMES[i]);
		}
		}
		return name;
		return name.toString();
		}
		}