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

Commit 136bdf80 authored by Andy Wickham's avatar Andy Wickham Committed by Automerger Merge Worker
Browse files

Merge "Add some gesture logs" into udc-qpr-dev am: 66072ca5 am: c18764fc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24755061



Change-Id: I02949308dda86a905029fdcc21dcfb80dd91e3b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27142036 c18764fc

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

+6 −1
Original line number Diff line number Diff line
@@ -952,6 +952,11 @@ public class TouchInteractionService extends Service { 
                }

            } else if (canStartSystemGesture && FeatureFlags.ENABLE_LONG_PRESS_NAV_HANDLE.get()

                    && !previousGestureState.isRecentsAnimationRunning()) {

                reasonString.append(NEWLINE_PREFIX)

                        .append(reasonPrefix)

                        .append(SUBSTRING_PREFIX)

                        .append("Long press nav handle enabled, "

                                + "using NavHandleLongPressInputConsumer");

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

            }

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

+5 −0
Original line number Diff line number Diff line
@@ -152,4 +152,9 @@ public class AccessibilityInputConsumer extends DelegateInputConsumer { 
            mDelegate.onMotionEvent(ev);

        }

    }



    @Override

    protected String getDelegatorName() {

        return "AccessibilityInputConsumer";

    }

}

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

+5 −0
Original line number Diff line number Diff line
@@ -278,4 +278,9 @@ public class AssistantInputConsumer extends DelegateInputConsumer { 
            return true;

        }

    }



    @Override

    protected String getDelegatorName() {

        return "AssistantInputConsumer";

    }

}

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

+9 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ import android.view.MotionEvent; 
import com.android.launcher3.testing.TestLogging;

import com.android.launcher3.testing.shared.TestProtocol;

import com.android.quickstep.InputConsumer;

import com.android.quickstep.util.ActiveGestureLog;

import com.android.systemui.shared.system.InputMonitorCompat;



public abstract class DelegateInputConsumer implements InputConsumer {
@@ -42,7 +43,15 @@ public abstract class DelegateInputConsumer implements InputConsumer { 
        mDelegate.onConsumerAboutToBeSwitched();

    }



    /**

     * Returns the name of this DelegateInputConsumer.

     */

    protected abstract String getDelegatorName();



    protected void setActive(MotionEvent ev) {

        ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString(getDelegatorName())

                .append(" became active"));



        mState = STATE_ACTIVE;

        TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers");

        mInputMonitor.pilferPointers();

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

+5 −0
Original line number Diff line number Diff line
@@ -80,4 +80,9 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer { 


        return distFromMiddle < areaFromMiddle;

    }



    @Override

    protected String getDelegatorName() {

        return "NavHandleLongPressInputConsumer";

    }

}