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

Commit d4be2fc1 authored by Austin Delgado's avatar Austin Delgado
Browse files

Remove TalkbackBP flag 

Bug: 310044658
Test: atest com.android.systemui.biometrics
Flag: EXEMPT removing bp_talkback flag
Change-Id: I2420b10c8f8069ceaf026f4511fb545fc7b84145
parent 76adc4a1

packages/SystemUI/aconfig/biometrics_framework.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -3,13 +3,6 @@ container: "system" 


# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.



flag {

    name: "bp_talkback"

    namespace: "biometrics_framework"

    description: "Adds talkback directional guidance when using UDFPS with biometric prompt"

    bug: "310044658"

}



flag {

    name: "constraint_bp"

    namespace: "biometrics_framework"

packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt

+3 −5
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.util.RotationUtils 
import android.view.HapticFeedbackConstants

import android.view.MotionEvent

import com.android.launcher3.icons.IconProvider

import com.android.systemui.Flags.bpTalkback

import com.android.systemui.Flags.constraintBp

import com.android.systemui.biometrics.UdfpsUtils

import com.android.systemui.biometrics.Utils
@@ -916,7 +915,6 @@ constructor( 
        touchExplorationEnabled: Boolean,

    ): Boolean {

        if (

            bpTalkback() &&

            modalities.first().hasUdfps &&

            touchExplorationEnabled &&

            !isAuthenticated.first().isAuthenticated

packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt

+0 −3
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import android.view.MotionEvent 
import android.view.Surface

import androidx.test.filters.SmallTest

import com.android.app.activityTaskManager

import com.android.systemui.Flags.FLAG_BP_TALKBACK

import com.android.systemui.Flags.FLAG_CONSTRAINT_BP

import com.android.systemui.SysuiTestCase

import com.android.systemui.biometrics.AuthController
@@ -1356,7 +1355,6 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa 
    }



    @Test

    @EnableFlags(FLAG_BP_TALKBACK)

    fun hint_for_talkback_guidance() = runGenericTest {

        val hint by collectLastValue(kosmos.promptViewModel.accessibilityHint)
@@ -1379,7 +1377,6 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa 
    }



    @Test

    @EnableFlags(FLAG_BP_TALKBACK)

    fun no_hint_for_talkback_guidance_after_auth() = runGenericTest {

        val hint by collectLastValue(kosmos.promptViewModel.accessibilityHint)