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

Commit dd04541f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Make keyguard binders update their own views" into udc-qpr-dev... 

Merge "Merge "Make keyguard binders update their own views" into udc-qpr-dev am: b185fae3" into udc-qpr-dev-plus-aosp am: aa290741

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



Change-Id: I529889604d54554824d284362764dbf7973badd8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5346f8ae aa290741

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

                                }

                            }

                        }

                    }