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

Commit 2a367007 authored by András Kurucz's avatar András Kurucz
Browse files

Make keyguard binders update their own views 

The modified binder classes (among other things) are binding an alpha
value to their views. Previously they were changing the alpha value of
their own views, but setting the accessibility flags on the root view
that is injected to them.
This was sometimes leading into marking the NotificationShadeWindowView as
IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS, which lead to skipping
refreshing the accessibility node cache, which lead to flaky or failing
integration tests.

Fixes: 294229320
Bug: 257543607
Test: execute Notification integration tests
Change-Id: Iff9a2865187b2ecbba92b7cf992fdcdbb3e2993e
parent 709d8358

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardAmbientIndicationAreaViewBinder.kt

+9 −8
Original line number Diff line number Diff line
@@ -67,14 +67,15 @@ object KeyguardAmbientIndicationAreaViewBinder { 
                repeatOnLifecycle(Lifecycle.State.STARTED) {

                    launch {

                        keyguardRootViewModel.alpha.collect { alpha ->

                            view.importantForAccessibility =

                            ambientIndicationArea?.apply {

                                this.importantForAccessibility =

                                    if (alpha == 0f) {

                                        View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS

                                    } else {

                                        View.IMPORTANT_FOR_ACCESSIBILITY_AUTO

                                    }



                            ambientIndicationArea?.alpha = alpha

                                this.alpha = alpha

                            }

                        }

                    }

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt

+9 −8
Original line number Diff line number Diff line
@@ -176,14 +176,15 @@ object KeyguardBottomAreaViewBinder { 


                    launch {

                        viewModel.alpha.collect { alpha ->

                            view.importantForAccessibility =

                            ambientIndicationArea?.apply {

                                this.importantForAccessibility =

                                    if (alpha == 0f) {

                                        View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS

                                    } else {

                                        View.IMPORTANT_FOR_ACCESSIBILITY_AUTO

                                    }



                            ambientIndicationArea?.alpha = alpha

                                this.alpha = alpha

                            }

                        }

                    }

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardIndicationAreaBinder.kt

+18 −16
Original line number Diff line number Diff line
@@ -73,25 +73,27 @@ object KeyguardIndicationAreaBinder { 
                    launch {

                        if (featureFlags.isEnabled(Flags.MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA)) {

                            keyguardRootViewModel.alpha.collect { alpha ->

                                view.importantForAccessibility =

                                indicationArea.apply {

                                    this.importantForAccessibility =

                                        if (alpha == 0f) {

                                            View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS

                                        } else {

                                            View.IMPORTANT_FOR_ACCESSIBILITY_AUTO

                                        }



                                indicationArea.alpha = alpha

                                    this.alpha = alpha

                                }

                            }

                        } else {

                            viewModel.alpha.collect { alpha ->

                                view.importantForAccessibility =

                                indicationArea.apply {

                                    this.importantForAccessibility =

                                        if (alpha == 0f) {

                                            View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS

                                        } else {

                                            View.IMPORTANT_FOR_ACCESSIBILITY_AUTO

                                        }



                                indicationArea.alpha = alpha

                                    this.alpha = alpha

                                }

                            }

                        }

                    }