Merge "Do not use rootview view binders." into main (6519ce4b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt

+8 −1

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel
		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 @@ constructor(
		bindKeyguardRootView()
		initializeViews()

		if (!SceneContainerFlag.isEnabled) {
		KeyguardBlueprintViewBinder.bind(keyguardRootView, keyguardBlueprintViewModel)
		}
		keyguardBlueprintCommandListener.start()
		}

		@@ -144,6 +147,10 @@ constructor(
		}

		private fun bindKeyguardRootView() {
		if (SceneContainerFlag.isEnabled) {
		return
		}

		rootViewHandle?.dispose()
		rootViewHandle =
		KeyguardRootViewBinder.bind(