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

Commit ceb31668 authored by Aaron Liu's avatar Aaron Liu
Browse files

Do not use rootview view binders. 

In the case where we are inflating composables for the rootview, we want
to remove the view binders of the legacy rootview. This step must be
done because it interferes with the clocks, where only 1 set of views is
inflated.

Test: show lockscreen on flexiglass
Bug: 316211368
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT
Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint
DEVELOPMENT

Change-Id: Iab93b88ddeb1e3025a4059d146e645b6d4e267bb
parent 7ab7cc7c

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(