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

Commit f67bdf70 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge "Analyze vertical swipes on QS's Scroll View." into tm-qpr-dev am: bb103d52 am: 99f9fae1 

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



Change-Id: I80b0a909969916aee466233d73454a49fd82fe9f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b5cf8a1 99f9fae1

packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -220,7 +220,7 @@ public class BrightLineFalsingManager implements FalsingManager { 
            return r;

            return r;

        }).collect(Collectors.toList());

        }).collect(Collectors.toList());





        logDebug("False Gesture: " + localResult[0]);

        logDebug("False Gesture (type: " + interactionType + "): " + localResult[0]);





        return localResult[0];

        return localResult[0];

    }

    }
@@ -454,6 +454,12 @@ public class BrightLineFalsingManager implements FalsingManager { 
        }

        }

    }

    }





    static void logVerbose(String msg) {

        if (DEBUG) {

            Log.v(TAG, msg);

        }

    }



    static void logInfo(String msg) {

    static void logInfo(String msg) {

        Log.i(TAG, msg);

        Log.i(TAG, msg);

        RECENT_INFO_LOG.add(msg);

        RECENT_INFO_LOG.add(msg);

packages/SystemUI/src/com/android/systemui/classifier/Classifier.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -42,8 +42,9 @@ public abstract class Classifier { 
    public static final int QS_COLLAPSE = 12;

    public static final int QS_COLLAPSE = 12;

    public static final int UDFPS_AUTHENTICATION = 13;

    public static final int UDFPS_AUTHENTICATION = 13;

    public static final int LOCK_ICON = 14;

    public static final int LOCK_ICON = 14;

    public static final int QS_SWIPE = 15;

    public static final int QS_SWIPE_SIDE = 15;

    public static final int BACK_GESTURE = 16;

    public static final int BACK_GESTURE = 16;

    public static final int QS_SWIPE_NESTED = 17;





    @IntDef({

    @IntDef({

            QUICK_SETTINGS,

            QUICK_SETTINGS,
@@ -62,7 +63,8 @@ public abstract class Classifier { 
            BRIGHTNESS_SLIDER,

            BRIGHTNESS_SLIDER,

            UDFPS_AUTHENTICATION,

            UDFPS_AUTHENTICATION,

            LOCK_ICON,

            LOCK_ICON,

            QS_SWIPE,

            QS_SWIPE_SIDE,

            QS_SWIPE_NESTED,

            BACK_GESTURE

            BACK_GESTURE

    })

    })

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

packages/SystemUI/src/com/android/systemui/classifier/DistanceClassifier.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHT 
import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHTLINE_FALSING_DISTANCE_VERTICAL_SWIPE_THRESHOLD_IN;

import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHTLINE_FALSING_DISTANCE_VERTICAL_SWIPE_THRESHOLD_IN;

import static com.android.systemui.classifier.Classifier.BRIGHTNESS_SLIDER;

import static com.android.systemui.classifier.Classifier.BRIGHTNESS_SLIDER;

import static com.android.systemui.classifier.Classifier.QS_COLLAPSE;

import static com.android.systemui.classifier.Classifier.QS_COLLAPSE;

import static com.android.systemui.classifier.Classifier.QS_SWIPE_NESTED;

import static com.android.systemui.classifier.Classifier.SHADE_DRAG;

import static com.android.systemui.classifier.Classifier.SHADE_DRAG;





import android.provider.DeviceConfig;

import android.provider.DeviceConfig;
@@ -156,7 +157,8 @@ class DistanceClassifier extends FalsingClassifier { 
                || interactionType == QS_COLLAPSE

                || interactionType == QS_COLLAPSE

                || interactionType == Classifier.UDFPS_AUTHENTICATION

                || interactionType == Classifier.UDFPS_AUTHENTICATION

                || interactionType == Classifier.LOCK_ICON

                || interactionType == Classifier.LOCK_ICON

                || interactionType == Classifier.QS_SWIPE) {

                || interactionType == Classifier.QS_SWIPE_SIDE

                || interactionType == QS_SWIPE_NESTED) {

            return Result.passed(0);

            return Result.passed(0);

        }

        }

packages/SystemUI/src/com/android/systemui/classifier/FalsingClassifier.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -147,6 +147,11 @@ public abstract class FalsingClassifier { 
        BrightLineFalsingManager.logDebug(msg);

        BrightLineFalsingManager.logDebug(msg);

    }

    }





    /** */

    public static void logVerbose(String msg) {

        BrightLineFalsingManager.logVerbose(msg);

    }



    /** */

    /** */

    public static void logInfo(String msg) {

    public static void logInfo(String msg) {

        BrightLineFalsingManager.logInfo(msg);

        BrightLineFalsingManager.logInfo(msg);

packages/SystemUI/src/com/android/systemui/classifier/FalsingDataProvider.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -78,10 +78,10 @@ public class FalsingDataProvider { 




    void onMotionEvent(MotionEvent motionEvent) {

    void onMotionEvent(MotionEvent motionEvent) {

        List<MotionEvent> motionEvents = unpackMotionEvent(motionEvent);

        List<MotionEvent> motionEvents = unpackMotionEvent(motionEvent);

        FalsingClassifier.logDebug("Unpacked into: " + motionEvents.size());

        FalsingClassifier.logVerbose("Unpacked into: " + motionEvents.size());

        if (BrightLineFalsingManager.DEBUG) {

        if (BrightLineFalsingManager.DEBUG) {

            for (MotionEvent m : motionEvents) {

            for (MotionEvent m : motionEvents) {

                FalsingClassifier.logDebug(

                FalsingClassifier.logVerbose(

                        "x,y,t: " + m.getX() + "," + m.getY() + "," + m.getEventTime());

                        "x,y,t: " + m.getX() + "," + m.getY() + "," + m.getEventTime());

            }

            }

        }

        }
@@ -92,7 +92,7 @@ public class FalsingDataProvider { 
        }

        }

        mRecentMotionEvents.addAll(motionEvents);

        mRecentMotionEvents.addAll(motionEvents);





        FalsingClassifier.logDebug("Size: " + mRecentMotionEvents.size());

        FalsingClassifier.logVerbose("Size: " + mRecentMotionEvents.size());





        mMotionEventListeners.forEach(listener -> listener.onMotionEvent(motionEvent));

        mMotionEventListeners.forEach(listener -> listener.onMotionEvent(motionEvent));