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

Commit ffff0be2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Makes GesturesObserver#clear as a private method." into tm-dev am: 44738ca8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17229070

Change-Id: Ic18efea2c937c87247ac8d065e6563f6131051c5
parents bc79c915 44738ca8

services/accessibility/java/com/android/server/accessibility/magnification/GesturesObserver.java

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public final class GesturesObserver implements GestureMatcher.StateChangeListene 
     * Clears all states to default.

     */

    @MainThread

    public void clear() {

    private void clear() {

        for (GestureMatcher matcher : mGestureMatchers) {

            matcher.clear();

        }

services/accessibility/java/com/android/server/accessibility/magnification/MagnificationGesturesObserver.java

+3 −4
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ class MagnificationGesturesObserver implements GesturesObserver.Listener { 
        mDelayedEventQueue = null;

        mCallback.onGestureCompleted(gestureId, mLastDownEventTime, delayEventQueue,

                event);

        recycleLastEvent();

        clear();

    }



    @Override
@@ -149,19 +149,18 @@ class MagnificationGesturesObserver implements GesturesObserver.Listener { 
        mDelayedEventQueue = null;

        mCallback.onGestureCancelled(mLastDownEventTime, delayEventQueue,

                mLastEvent);

        recycleLastEvent();

        clear();

    }



    /**

     * Resets all state to default.

     */

    void clear() {

    private void clear() {

        if (DBG) {

            Slog.d(LOG_TAG, "clear:" + mDelayedEventQueue);

        }

        recycleLastEvent();

        mLastDownEventTime = 0;

        mGesturesObserver.clear();

        if (mDelayedEventQueue != null) {

            for (MotionEventInfo eventInfo2: mDelayedEventQueue) {

                eventInfo2.recycle();

services/accessibility/java/com/android/server/accessibility/magnification/WindowMagnificationGestureHandler.java

+0 −10
Original line number Diff line number Diff line
@@ -439,21 +439,11 @@ public class WindowMagnificationGestureHandler extends MagnificationGestureHandl 
                    new TwoFingersDownOrSwipe(context));

        }



        @Override

        public void onExit() {

            clear();

        }



        @Override

        public void onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) {

            mGesturesObserver.onMotionEvent(event, rawEvent, policyFlags);

        }



        @Override

        public void clear() {

            mGesturesObserver.clear();

        }



        @Override

        public String toString() {

            return "DetectingState{"