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

Commit abf5a1e3 authored by Matt Pietal's avatar Matt Pietal
Browse files

A11Y - Remove disruptive bouncer announcements

Instead, rely on live regions to announce text updates
to convey security input messages.

Fixes: 383243359
Fixes: 373973165
Test: manual - use talkbalk on all bouncer types
Flag: EXEMPT bugfix
Change-Id: I0d4ec06ada0d40aa831d943d4481d4d4f0e6dc4e
parent 1e340f3c
Loading
Loading
Loading
Loading
+0 −17
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ package com.android.keyguard;

import static com.google.common.truth.Truth.assertThat;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@@ -28,8 +26,6 @@ import static org.mockito.Mockito.when;

import android.hardware.biometrics.BiometricSourceType;
import android.testing.TestableLooper;
import android.text.Editable;
import android.text.TextWatcher;

import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest;
@@ -98,19 +94,6 @@ public class KeyguardMessageAreaControllerTest extends SysuiTestCase {
        verify(mKeyguardMessageArea).setMessage("", /* animate= */ true);
    }

    @Test
    public void textChanged_AnnounceForAccessibility() {
        ArgumentCaptor<TextWatcher> textWatcherArgumentCaptor = ArgumentCaptor.forClass(
                TextWatcher.class);
        mMessageAreaController.onViewAttached();
        verify(mKeyguardMessageArea).addTextChangedListener(textWatcherArgumentCaptor.capture());

        textWatcherArgumentCaptor.getValue().afterTextChanged(
                Editable.Factory.getInstance().newEditable("abc"));
        verify(mKeyguardMessageArea).removeCallbacks(any(Runnable.class));
        verify(mKeyguardMessageArea).postDelayed(any(Runnable.class), anyLong());
    }

    @Test
    public void testSetBouncerVisible() {
        mMessageAreaController.setIsVisible(true);
+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/keyguard_lock_padding"
        android:importantForAccessibility="no"
        android:accessibilityLiveRegion="polite"
        android:ellipsize="marquee"
        android:focusable="false"
        android:gravity="center"
+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@
            <com.android.systemui.bouncer.ui.BouncerMessageView
                android:id="@+id/bouncer_message_view"
                android:screenReaderFocusable="true"
                android:accessibilityLiveRegion="polite"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="vertical" />
+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@
    <com.android.systemui.bouncer.ui.BouncerMessageView
        android:id="@+id/bouncer_message_view"
        android:screenReaderFocusable="true"
        android:accessibilityLiveRegion="polite"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"
+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@
            <com.android.systemui.bouncer.ui.BouncerMessageView
                android:id="@+id/bouncer_message_view"
                android:screenReaderFocusable="true"
                android:accessibilityLiveRegion="polite"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="vertical" />
Loading