summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Beverly <beverlyt@google.com> 2024-03-15 20:15:34 +0000
committer Beverly Tai <beverlyt@google.com> 2024-03-15 20:19:46 +0000
commitd2845632eb4b8829b1f89e54de6b6338205db3bd (patch)
tree883035c86fd1f28b32967d43f523605da05f6638
parent7e37a4b06f652f8daf920f888715c9f8736dae15 (diff)
Update keyguard root view alpha if udfps refactor flag is enabled
Flag: ACONFIG com.android.systemui.device_entry_udfps_refactor TEAMFOOD Test: manually disable keyguard_bottom_area flag and enable device_entry_udfps_refactor flag. Swipe up on the device with just an unlock icon and see device entry icon fades. Fixes: 329365118 Change-Id: If832d140a8b85237a33806ec5b038d04d397b2ca
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt9
1 files changed, 6 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt
index fc95ec927a4c..d0246a8cd872 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt
@@ -44,6 +44,7 @@ import com.android.systemui.common.shared.model.Text
import com.android.systemui.common.shared.model.TintedIcon
import com.android.systemui.common.ui.ConfigurationState
import com.android.systemui.deviceentry.domain.interactor.DeviceEntryHapticsInteractor
+import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor
import com.android.systemui.keyguard.shared.model.KeyguardState
import com.android.systemui.keyguard.shared.model.TransitionState
import com.android.systemui.keyguard.ui.viewmodel.BurnInParameters
@@ -142,12 +143,14 @@ object KeyguardRootViewBinder {
}
}
- if (keyguardBottomAreaRefactor()) {
+ if (keyguardBottomAreaRefactor() || DeviceEntryUdfpsRefactor.isEnabled) {
launch {
viewModel.alpha(viewState).collect { alpha ->
view.alpha = alpha
- childViews[statusViewId]?.alpha = alpha
- childViews[burnInLayerId]?.alpha = alpha
+ if (keyguardBottomAreaRefactor()) {
+ childViews[statusViewId]?.alpha = alpha
+ childViews[burnInLayerId]?.alpha = alpha
+ }
}
}
}