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

Commit 14716646 authored by András Kurucz's avatar András Kurucz Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Id0695ac6589ed1f42644a844eefe8c411e07f0a8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6579cbc9 b185fae3

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

                                }

                            }

                        }

                    }