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

Commit 4261ab85 authored by Austin Delgado's avatar Austin Delgado
Browse files

Remove UDFPS_NEW_TOUCH_DETECTION flag 

Bug: 259264861
Test: atest SystemUITests:com.android.systemui.biometrics
Change-Id: I1b8fa0b54d536f498f054567811d44cdc2d313dc
parent 71464f4f

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationView.java

+0 −3
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ public abstract class UdfpsAnimationView extends FrameLayout { 
    private float mDialogSuggestedAlpha = 1f;

    private float mNotificationShadeExpansion = 0f;



    // Used for Udfps ellipse detection when flag is true, set by AnimationViewController

    boolean mUseExpandedOverlay = false;



    // mAlpha takes into consideration the status bar expansion amount and dialog suggested alpha

    private int mAlpha;

    boolean mPauseAuth;

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+6 −23
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ import com.android.systemui.dagger.qualifiers.Main; 
import com.android.systemui.doze.DozeReceiver;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.keyguard.ScreenLifecycle;

import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor;

import com.android.systemui.keyguard.ui.adapter.UdfpsKeyguardViewControllerAdapter;
@@ -259,8 +258,6 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
        final int touchConfigId = mContext.getResources().getInteger(

                com.android.internal.R.integer.config_selected_udfps_touch_detection);

        pw.println("mSensorProps=(" + mSensorProps + ")");

        pw.println("Using new touch detection framework: " + mFeatureFlags.isEnabled(

                Flags.UDFPS_NEW_TOUCH_DETECTION));

        pw.println("touchConfigId: " + touchConfigId);

    }
@@ -499,11 +496,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { 


    @VisibleForTesting

    boolean onTouch(long requestId, @NonNull MotionEvent event, boolean fromUdfpsView) {

        if (mFeatureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)) {

        return newOnTouch(requestId, event, fromUdfpsView);

        } else {

            return oldOnTouch(requestId, event, fromUdfpsView);

        }

    }



    private int getBiometricSessionType() {
@@ -917,8 +910,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
        mInputManager = inputManager;

        mUdfpsKeyguardAccessibilityDelegate = udfpsKeyguardAccessibilityDelegate;



        mTouchProcessor = mFeatureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)

                ? singlePointerTouchProcessor : null;

        mTouchProcessor = singlePointerTouchProcessor;

        mSessionTracker = sessionTracker;



        mDumpManager.registerDumpable(TAG, this);
@@ -1251,13 +1243,8 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
                }

            });

        } else {

            if (mFeatureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)) {

            mFingerprintManager.onPointerDown(requestId, mSensorProps.sensorId, pointerId, x, y,

                    minor, major, orientation, time, gestureStart, isAod);

            } else {

                mFingerprintManager.onPointerDown(requestId, mSensorProps.sensorId, (int) x,

                        (int) y, minor, major);

            }

        }

        Trace.endAsyncSection("UdfpsController.e2e.onPointerDown", 0);

        final UdfpsView view = mOverlay.getOverlayView();
@@ -1315,12 +1302,8 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
                    }

                });

            } else {

                if (mFeatureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)) {

                mFingerprintManager.onPointerUp(requestId, mSensorProps.sensorId, pointerId, x,

                        y, minor, major, orientation, time, gestureStart, isAod);

                } else {

                    mFingerprintManager.onPointerUp(requestId, mSensorProps.sensorId);

                }

            }

            for (Callback cb : mCallbacks) {

                cb.onFingerUp();

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt

+18 −33
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor 
import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor

import com.android.systemui.dump.DumpManager

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.flags.Flags.REFACTOR_UDFPS_KEYGUARD_VIEWS

import com.android.systemui.keyguard.ui.adapter.UdfpsKeyguardViewControllerAdapter

import com.android.systemui.keyguard.ui.viewmodel.UdfpsKeyguardViewModels
@@ -134,11 +133,8 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
        privateFlags = WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY

        // Avoid announcing window title.

        accessibilityTitle = " "



        if (featureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)) {

        inputFeatures = WindowManager.LayoutParams.INPUT_FEATURE_SPY

    }

    }



    /** If the overlay is currently showing. */

    val isShowing: Boolean
@@ -206,7 +202,6 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
                        overlayTouchListener!!

                    )

                    overlayTouchListener?.onTouchExplorationStateChanged(true)

                    useExpandedOverlay = featureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)

                }

            } catch (e: RuntimeException) {

                Log.e(TAG, "showUdfpsOverlay | failed to add window", e)
@@ -367,10 +362,6 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
    ): WindowManager.LayoutParams {

        val paddingX = animation?.paddingX ?: 0

        val paddingY = animation?.paddingY ?: 0

        if (!featureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION) && animation != null &&

                animation.listenForTouchesOutsideView()) {

            flags = flags or WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH

        }



        val isEnrollment = when (requestReason) {

            REASON_ENROLL_FIND_SENSOR, REASON_ENROLL_ENROLLING -> true
@@ -379,7 +370,6 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 


        // Use expanded overlay unless touchExploration enabled

        var rotatedBounds =

            if (featureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)) {

            if (accessibilityManager.isTouchExplorationEnabled && isEnrollment) {

                Rect(overlayParams.sensorBounds)

            } else {
@@ -390,9 +380,6 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
                    overlayParams.naturalDisplayHeight

                )

            }

            } else {

                Rect(overlayParams.sensorBounds)

            }



        val rot = overlayParams.rotation

        if (rot == Surface.ROTATION_90 || rot == Surface.ROTATION_270) {
@@ -412,7 +399,6 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
                    rot

                )



                if (featureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)) {

                RotationUtils.rotateBounds(

                    sensorBounds,

                    overlayParams.naturalDisplayWidth,
@@ -421,7 +407,6 @@ class UdfpsControllerOverlay @JvmOverloads constructor( 
                )

            }

        }

        }



        x = rotatedBounds.left - paddingX

        y = rotatedBounds.top - paddingY

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.kt

+0 −4
Original line number Diff line number Diff line
@@ -43,10 +43,6 @@ class UdfpsKeyguardView( 
        return fingerprintDrawablePlaceHolder

    }



    fun useExpandedOverlay(useExpandedOverlay: Boolean) {

        mUseExpandedOverlay = useExpandedOverlay

    }



    fun isVisible(): Boolean {

        return visible

    }

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewControllerLegacy.kt

+1 −24
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.biometrics 
import android.animation.ValueAnimator

import android.content.res.Configuration

import android.util.MathUtils

import android.view.MotionEvent

import android.view.View

import androidx.annotation.VisibleForTesting

import androidx.lifecycle.Lifecycle
@@ -27,16 +26,15 @@ import androidx.lifecycle.repeatOnLifecycle 
import com.android.app.animation.Interpolators

import com.android.keyguard.BouncerPanelExpansionCalculator.aboutToShowBouncerProgress

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.systemui.res.R

import com.android.systemui.animation.ActivityLaunchAnimator

import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor

import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor

import com.android.systemui.dump.DumpManager

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.keyguard.ui.adapter.UdfpsKeyguardViewControllerAdapter

import com.android.systemui.lifecycle.repeatWhenAttached

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.res.R

import com.android.systemui.statusbar.LockscreenShadeTransitionController

import com.android.systemui.statusbar.StatusBarState

import com.android.systemui.statusbar.notification.stack.StackStateAnimator
@@ -80,8 +78,6 @@ open class UdfpsKeyguardViewControllerLegacy( 
    ),

    UdfpsKeyguardViewControllerAdapter {

    private val uniqueIdentifier = this.toString()

    private val useExpandedOverlay: Boolean =

        featureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION)

    private var showingUdfpsBouncer = false

    private var udfpsRequested = false

    private var qsExpansion = 0f
@@ -192,24 +188,6 @@ open class UdfpsKeyguardViewControllerLegacy( 
                updateAlpha()

                updatePauseAuth()

            }



            /**

             * Forward touches to the UdfpsController. This allows the touch to start from outside

             * the sensor area and then slide their finger into the sensor area.

             */

            override fun onTouch(event: MotionEvent) {

                // Don't forward touches if the shade has already started expanding.

                if (transitionToFullShadeProgress != 0f) {

                    return

                }



                // Forwarding touches not needed with expanded overlay

                if (useExpandedOverlay) {

                    return

                } else {

                    udfpsController.onTouch(event)

                }

            }

        }



    private val occludingAppBiometricUI: OccludingAppBiometricUI =
@@ -294,7 +272,6 @@ open class UdfpsKeyguardViewControllerLegacy( 
        keyguardViewManager.setOccludingAppBiometricUI(occludingAppBiometricUI)

        lockScreenShadeTransitionController.mUdfpsKeyguardViewControllerLegacy = this

        activityLaunchAnimator.addListener(activityLaunchAnimatorListener)

        view.mUseExpandedOverlay = useExpandedOverlay

        view.startIconAsyncInflate {

            val animationViewInternal: View =

                view.requireViewById(R.id.udfps_animation_view_internal)