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

Commit aa290741 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
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
parents 264b662f 14716646

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

                                }

                            }

                        }

                    }