Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use announceForAccessibility to workaround Talkback rate-limitation" into udc-d1-dev am: cb7d38e282

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24305681

Change-Id: Id0fce6fa16c0346034b37dc5d4ed61297164fd72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Grace Cheng
2023-08-10 19:08:54 +00:00
committed by Automerger Merge Worker
parent 24afc9eb78 cb7d38e282
commit 46a47c18e7
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/biometrics/Utils.kt
View File

@@ -60,6 +60,13 @@ object Utils {
return dp * (density / DisplayMetrics.DENSITY_DEFAULT)
}
/**
* Note: Talkback 14.0 has new rate-limitation design to reduce frequency
* of TYPE_WINDOW_CONTENT_CHANGED events to once every 30 seconds.
* (context: b/281765653#comment18)
* Using {@link View#announceForAccessibility} instead as workaround when sending events
* exceeding this frequency is required.
*/
@JvmStatic
fun notifyAccessibilityContentChanged(am: AccessibilityManager, view: ViewGroup) {
if (!am.isEnabled) {

29
packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt
View File

@@ -45,7 +45,6 @@ import com.android.systemui.biometrics.AuthBiometricView.Callback
import com.android.systemui.biometrics.AuthBiometricViewAdapter
import com.android.systemui.biometrics.AuthIconController
import com.android.systemui.biometrics.AuthPanelController
import com.android.systemui.biometrics.Utils
import com.android.systemui.biometrics.domain.model.BiometricModalities
import com.android.systemui.biometrics.shared.model.BiometricModality
import com.android.systemui.biometrics.shared.model.PromptKind
@@ -80,9 +79,6 @@ object BiometricViewBinder {
applicationScope: CoroutineScope,
): AuthBiometricViewAdapter {
val accessibilityManager = view.context.getSystemService(AccessibilityManager::class.java)!!
fun notifyAccessibilityChanged() {
Utils.notifyAccessibilityContentChanged(accessibilityManager, view)
}
val textColorError =
view.resources.getColor(R.color.biometric_dialog_error, view.context.theme)
@@ -326,21 +322,14 @@ object BiometricViewBinder {
}
}
// not sure why this is here, but the legacy code did it probably needed?
launch {
viewModel.isAuthenticating.collect { isAuthenticating ->
if (isAuthenticating) {
notifyAccessibilityChanged()
}
}
}
// dismiss prompt when authenticated and confirmed
launch {
viewModel.isAuthenticated.collect { authState ->
// Disable background view for cancelling authentication once authenticated,
// and remove from talkback
if (authState.isAuthenticated) {
// Prevents Talkback from speaking subtitle after already authenticated
subtitleView.importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO
backgroundView.setOnClickListener(null)
backgroundView.importantForAccessibility =
IMPORTANT_FOR_ACCESSIBILITY_NO
@@ -349,7 +338,6 @@ object BiometricViewBinder {
view.announceForAccessibility(
view.resources.getString(R.string.biometric_dialog_authenticated)
)
notifyAccessibilityChanged()
launch {
delay(authState.delay)
@@ -381,7 +369,18 @@ object BiometricViewBinder {
!accessibilityManager.isEnabled ||
!accessibilityManager.isTouchExplorationEnabled
notifyAccessibilityChanged()
/**
* Note: Talkback 14.0 has new rate-limitation design to reduce frequency of
* TYPE_WINDOW_CONTENT_CHANGED events to once every 30 seconds. (context:
* b/281765653#comment18) Using {@link View#announceForAccessibility}
* instead as workaround since sending events exceeding this frequency is
* required.
*/
indicatorMessageView?.text?.let {
if (it.isNotBlank()) {
view.announceForAccessibility(it)
}
}
}
}
}