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

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

Merge "Add falsing classifier for media carousel" into main

parents cddf2343 d288de1a

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

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ public abstract class Classifier { 
    public static final int MEDIA_SEEKBAR = 18;

    public static final int ALTERNATE_BOUNCER_SWIPE = 19;

    public static final int GLANCEABLE_HUB_SWIPE = 20;

    public static final int MEDIA_CAROUSEL_SWIPE = 21;



    @IntDef({

            QUICK_SETTINGS,
@@ -69,6 +70,7 @@ public abstract class Classifier { 
            MEDIA_SEEKBAR,

            ALTERNATE_BOUNCER_SWIPE,

            GLANCEABLE_HUB_SWIPE,

            MEDIA_CAROUSEL_SWIPE,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface InteractionType {}

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

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHT 
import static com.android.systemui.classifier.Classifier.ALTERNATE_BOUNCER_SWIPE;

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

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

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

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_SWIPE_NESTED;
@@ -157,6 +158,7 @@ class DistanceClassifier extends FalsingClassifier { 
            double historyBelief, double historyConfidence) {

        if (interactionType == BRIGHTNESS_SLIDER

                || interactionType == MEDIA_SEEKBAR

                || interactionType == MEDIA_CAROUSEL_SWIPE

                || interactionType == SHADE_DRAG

                || interactionType == QS_COLLAPSE

                || interactionType == Classifier.UDFPS_AUTHENTICATION

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

+2 −1
Original line number 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.systemui.classifier.Classifier.BRIGHTNESS_SLIDER;

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

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_SWIPE_SIDE;
@@ -120,7 +121,7 @@ class ProximityClassifier extends FalsingClassifier { 
            double historyBelief, double historyConfidence) {

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

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

                || interactionType == MEDIA_SEEKBAR) {

                || interactionType == MEDIA_SEEKBAR || interactionType == MEDIA_CAROUSEL_SWIPE) {

            return Result.passed(0);

        }

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

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 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.GLANCEABLE_HUB_SWIPE;

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

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

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_DRAG_DOWN;
@@ -74,6 +75,7 @@ public class TypeClassifier extends FalsingClassifier { 
                break;

            case NOTIFICATION_DISMISS:

            case GLANCEABLE_HUB_SWIPE:

            case MEDIA_CAROUSEL_SWIPE:

                wrongDirection = vertical;

                break;

            case ALTERNATE_BOUNCER_SWIPE:

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

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHT 
import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHTLINE_FALSING_ZIGZAG_Y_PRIMARY_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.MEDIA_CAROUSEL_SWIPE;

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

import static com.android.systemui.classifier.Classifier.SHADE_DRAG;
@@ -92,6 +93,7 @@ class ZigZagClassifier extends FalsingClassifier { 
            double historyBelief, double historyConfidence) {

        if (interactionType == BRIGHTNESS_SLIDER

                || interactionType == MEDIA_SEEKBAR

                || interactionType == MEDIA_CAROUSEL_SWIPE

                || interactionType == SHADE_DRAG) {

            return Result.passed(0);

        }