Merge "Update SFPS indicator content description" into main (ab6525c9) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinderTest.kt

+0 −6

Original line number	Diff line number	Diff line
		@@ -58,7 +58,6 @@ import org.mockito.Mockito.verify
		import org.mockito.Mockito.`when`
		import org.mockito.junit.MockitoJUnit
		import org.mockito.junit.MockitoRule
		import org.mockito.kotlin.firstValue

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		@@ -116,12 +115,7 @@ class SideFpsOverlayViewBinderTest : SysuiTestCase() {
		runCurrent()

		verify(kosmos.windowManager).addView(any(), any())

		verify(kosmos.windowManager).addView(viewCaptor.capture(), any())
		verify(viewCaptor.firstValue)
		.announceForAccessibility(
		mContext.getText(R.string.accessibility_side_fingerprint_indicator_label)
		)

		updateSfpsIndicatorRequests(kosmos, mContext, alternateBouncerRequest = false)
		runCurrent()

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		android:id="@+id/sidefps_animation"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:contentDescription="@string/accessibility_side_fingerprint_indicator_label"
		app:lottie_autoPlay="true"
		app:lottie_loop="true"
		app:lottie_rawRes="@raw/sfps_pulse"/>
		No newline at end of file

+6 −7

Original line number	Diff line number	Diff line
		@@ -99,11 +99,6 @@ constructor(
		show()
		} else if (showIndicatorForDeviceEntry) {
		show()
		overlayView?.announceForAccessibility(
		applicationContext.resources.getString(
		R.string.accessibility_side_fingerprint_indicator_label
		)
		)
		} else {
		hide()
		}
		@@ -182,6 +177,11 @@ constructor(

		overlayShowAnimator.start()

		/**
		* Intercepts TYPE_WINDOW_STATE_CHANGED accessibility event, preventing Talkback
		* from speaking @string/accessibility_fingerprint_label twice when sensor location
		* indicator is in focus
		*/
		it.setAccessibilityDelegate(
		object : View.AccessibilityDelegate() {
		override fun dispatchPopulateAccessibilityEvent(
		@@ -190,8 +190,7 @@ constructor(
		): Boolean {
		return if (
		event.getEventType() ===
		android.view.accessibility.AccessibilityEvent
		.TYPE_WINDOW_STATE_CHANGED
		AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED
		) {
		true
		} else {