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

Commit 7e863a12 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove string concatenation uses with ActiveGestureLog" into main

parents 2efa84d5 eaa495a8

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

+8 −8
Original line number Diff line number Diff line
@@ -923,8 +923,8 @@ public class TouchInteractionService extends Service { 
            handleOrientationSetup(base);

        }

        if (mDeviceState.isFullyGesturalNavMode() || newGestureState.isTrackpadGesture()) {

            String reasonPrefix = "device is in gesture navigation mode or 3-button mode with a"

                    + " trackpad gesture";

            String reasonPrefix =

                    "device is in gesture navigation mode or 3-button mode with a trackpad gesture";

            if (mDeviceState.canTriggerAssistantAction(event)) {

                reasonString.append(NEWLINE_PREFIX)

                        .append(reasonPrefix)
@@ -945,8 +945,8 @@ public class TouchInteractionService extends Service { 
                    reasonString.append(NEWLINE_PREFIX)

                            .append(reasonPrefix)

                            .append(SUBSTRING_PREFIX)

                            .append("TaskbarActivityContext != null, "

                                    + "using TaskbarUnstashInputConsumer");

                            .append("TaskbarActivityContext != null, ")

                            .append("using TaskbarUnstashInputConsumer");

                    base = new TaskbarUnstashInputConsumer(this, base, mInputMonitorCompat, tac,

                            mOverviewCommandHelper);

                }
@@ -955,8 +955,8 @@ public class TouchInteractionService extends Service { 
                reasonString.append(NEWLINE_PREFIX)

                        .append(reasonPrefix)

                        .append(SUBSTRING_PREFIX)

                        .append("Long press nav handle enabled, "

                                + "using NavHandleLongPressInputConsumer");

                        .append("Long press nav handle enabled, ")

                        .append("using NavHandleLongPressInputConsumer");

                base = new NavHandleLongPressInputConsumer(this, base, mInputMonitorCompat);

            }
@@ -1149,8 +1149,8 @@ public class TouchInteractionService extends Service { 
        if ((mDeviceState.isFullyGesturalNavMode() || gestureState.isTrackpadGesture())

                && gestureState.getRunningTask() != null) {

            reasonString.append(SUBSTRING_PREFIX)

                    .append("device is in gesture nav mode or 3-button mode with a trackpad gesture"

                            + "and running task != null")

                    .append("device is in gesture nav mode or 3-button mode with a trackpad")

                    .append(" gesture and running task != null")

                    .append(", using DeviceLockedInputConsumer");

            return new DeviceLockedInputConsumer(

                    this, mDeviceState, mTaskAnimationManager, gestureState, mInputMonitorCompat);