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

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

Fix talkback not cycling on Biometric Prompt 

Fixes talkback on biometric prompt not looping around to background view
after swiping past positive button.

Test: Verified manually
Bug: 353631541
Flag: EXEMPT bugfix
Change-Id: I1077d2f0ba593100b80de4931909b3d68bf8cb12
parent 033d295d

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

+2 −2
Original line number Diff line number Diff line
@@ -428,7 +428,6 @@ public class AuthContainerView extends LinearLayout 
        });



        setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);

        setFocusableInTouchMode(true);

        requestFocus();

    }
@@ -480,7 +479,8 @@ public class AuthContainerView extends LinearLayout 
        }

    }



    private void onBackInvoked() {

    @VisibleForTesting

    public void onBackInvoked() {

        sendEarlyUserCanceled();

        animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);

    }

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt

+2 −5
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.os.UserManager 
import android.testing.TestableLooper

import android.testing.TestableLooper.RunWithLooper

import android.testing.ViewUtils

import android.view.KeyEvent

import android.view.View

import android.view.WindowInsets

import android.view.WindowManager
@@ -202,8 +201,7 @@ open class AuthContainerViewTest : SysuiTestCase() { 
        val root = container.rootView



        // Simulate back invocation

        container.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK))

        container.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK))

        container.onBackInvoked()

        waitForIdleSync()



        assertThat(container.parent).isNull()
@@ -217,8 +215,7 @@ open class AuthContainerViewTest : SysuiTestCase() { 
        val root = container.rootView



        // Simulate back invocation

        container.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK))

        container.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK))

        container.onBackInvoked()

        waitForIdleSync()



        assertThat(container.parent).isNull()