Merge "Do not use rootview view binders." into main
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
index 50836fe..afef875 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
@@ -46,6 +46,7 @@
import com.android.systemui.keyguard.ui.viewmodel.OccludingAppDeviceEntryMessageViewModel
import com.android.systemui.plugins.FalsingManager
import com.android.systemui.res.R
+import com.android.systemui.scene.shared.flag.SceneContainerFlag
import com.android.systemui.shade.NotificationShadeWindowView
import com.android.systemui.shade.domain.interactor.ShadeInteractor
import com.android.systemui.statusbar.KeyguardIndicationController
@@ -111,7 +112,9 @@
bindKeyguardRootView()
initializeViews()
- KeyguardBlueprintViewBinder.bind(keyguardRootView, keyguardBlueprintViewModel)
+ if (!SceneContainerFlag.isEnabled) {
+ KeyguardBlueprintViewBinder.bind(keyguardRootView, keyguardBlueprintViewModel)
+ }
keyguardBlueprintCommandListener.start()
}
@@ -144,6 +147,10 @@
}
private fun bindKeyguardRootView() {
+ if (SceneContainerFlag.isEnabled) {
+ return
+ }
+
rootViewHandle?.dispose()
rootViewHandle =
KeyguardRootViewBinder.bind(