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

Commit 4e8f01cb authored by Michael Mikhail's avatar Michael Mikhail Committed by Automerger Merge Worker
Browse files

Merge "Apply falsing manager on seekbar" into tm-qpr-dev am: 9d538615 am: 2ec01c26 

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



Change-Id: I499085cc390c2f126bf05c99df9effa10f520f5c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 720a3982 2ec01c26

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ public abstract class Classifier { 
    public static final int QS_SWIPE_SIDE = 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;

    public static final int QS_SWIPE_NESTED = 17;

    public static final int MEDIA_SEEKBAR = 18;





    @IntDef({

    @IntDef({

            QUICK_SETTINGS,

            QUICK_SETTINGS,
@@ -65,7 +66,8 @@ public abstract class Classifier { 
            LOCK_ICON,

            LOCK_ICON,

            QS_SWIPE_SIDE,

            QS_SWIPE_SIDE,

            QS_SWIPE_NESTED,

            QS_SWIPE_NESTED,

            BACK_GESTURE

            BACK_GESTURE,

            MEDIA_SEEKBAR,

    })

    })

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    public @interface InteractionType {}

    public @interface InteractionType {}

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHT 
import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHTLINE_FALSING_DISTANCE_VERTICAL_FLING_THRESHOLD_IN;

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

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.MEDIA_SEEKBAR;

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.QS_SWIPE_NESTED;

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

import static com.android.systemui.classifier.Classifier.SHADE_DRAG;
@@ -153,6 +154,7 @@ class DistanceClassifier extends FalsingClassifier { 
            @Classifier.InteractionType int interactionType,

            @Classifier.InteractionType int interactionType,

            double historyBelief, double historyConfidence) {

            double historyBelief, double historyConfidence) {

        if (interactionType == BRIGHTNESS_SLIDER

        if (interactionType == BRIGHTNESS_SLIDER

                || interactionType == MEDIA_SEEKBAR

                || interactionType == SHADE_DRAG

                || interactionType == SHADE_DRAG

                || interactionType == QS_COLLAPSE

                || interactionType == QS_COLLAPSE

                || interactionType == Classifier.UDFPS_AUTHENTICATION

                || interactionType == Classifier.UDFPS_AUTHENTICATION

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.classifier; 




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

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

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.MEDIA_SEEKBAR;

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_SIDE;

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

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

import static com.android.systemui.classifier.Classifier.QUICK_SETTINGS;
@@ -119,7 +120,8 @@ class ProximityClassifier extends FalsingClassifier { 
            @Classifier.InteractionType int interactionType,

            @Classifier.InteractionType int interactionType,

            double historyBelief, double historyConfidence) {

            double historyBelief, double historyConfidence) {

        if (interactionType == QUICK_SETTINGS || interactionType == BRIGHTNESS_SLIDER

        if (interactionType == QUICK_SETTINGS || interactionType == BRIGHTNESS_SLIDER

                || interactionType == QS_COLLAPSE || interactionType == QS_SWIPE_SIDE) {

                || interactionType == QS_COLLAPSE || interactionType == QS_SWIPE_SIDE

                || interactionType == MEDIA_SEEKBAR) {

            return Result.passed(0);

            return Result.passed(0);

        }

        }

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ package com.android.systemui.classifier; 
import static com.android.systemui.classifier.Classifier.BOUNCER_UNLOCK;

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

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.LEFT_AFFORDANCE;

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

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

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

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

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

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

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

import static com.android.systemui.classifier.Classifier.PULSE_EXPAND;
@@ -93,6 +94,10 @@ public class TypeClassifier extends FalsingClassifier { 
            case QS_SWIPE_NESTED:

            case QS_SWIPE_NESTED:

                wrongDirection = !vertical;

                wrongDirection = !vertical;

                break;

                break;

            case MEDIA_SEEKBAR:

                confidence = 0;

                wrongDirection = vertical;

                break;

            default:

            default:

                wrongDirection = true;

                wrongDirection = true;

                break;

                break;

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHT 
import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHTLINE_FALSING_ZIGZAG_Y_SECONDARY_DEVIANCE;

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

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.LOCK_ICON;

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

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

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

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





import android.graphics.Point;

import android.graphics.Point;
@@ -91,6 +92,7 @@ class ZigZagClassifier extends FalsingClassifier { 
            @Classifier.InteractionType int interactionType,

            @Classifier.InteractionType int interactionType,

            double historyBelief, double historyConfidence) {

            double historyBelief, double historyConfidence) {

        if (interactionType == BRIGHTNESS_SLIDER

        if (interactionType == BRIGHTNESS_SLIDER

                || interactionType == MEDIA_SEEKBAR

                || interactionType == SHADE_DRAG

                || interactionType == SHADE_DRAG

                || interactionType == LOCK_ICON) {

                || interactionType == LOCK_ICON) {

            return Result.passed(0);

            return Result.passed(0);