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

Commit 0b23bca6 authored by George Lin's avatar George Lin
Browse files

Pass Screen info to Workspace binder (2/2) 

This is to avoid sending invalid messages to the wrong workspace
callback.

Test: Manually tested.
Bug: 348462236
Flag: com.android.systemui.new_picker_ui
Change-Id: Ie7d57248966e064ab04f21920fe77dbd86727ef0
parent 69d532b7

src/com/android/wallpaper/picker/common/preview/ui/binder/ThemePickerWorkspaceCallbackBinder.kt

+54 −49
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewC 
import com.android.systemui.shared.quickaffordance.shared.model.KeyguardPreviewConstants.MESSAGE_ID_START_CUSTOMIZING_QUICK_AFFORDANCES

import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerLockCustomizationOption

import com.android.wallpaper.customization.ui.viewmodel.ThemePickerCustomizationOptionsViewModel

import com.android.wallpaper.model.Screen

import com.android.wallpaper.picker.common.preview.ui.binder.WorkspaceCallbackBinder.Companion.sendMessage

import com.android.wallpaper.picker.customization.ui.viewmodel.CustomizationOptionsViewModel

import javax.inject.Inject
@@ -48,11 +49,13 @@ constructor(private val defaultWorkspaceCallbackBinder: DefaultWorkspaceCallback 
    override fun bind(

        workspaceCallback: Message,

        viewModel: CustomizationOptionsViewModel,

        screen: Screen,

        lifecycleOwner: LifecycleOwner,

    ) {

        defaultWorkspaceCallbackBinder.bind(

            workspaceCallback = workspaceCallback,

            viewModel = viewModel,

            screen = screen,

            lifecycleOwner = lifecycleOwner,

        )
@@ -62,6 +65,7 @@ constructor(private val defaultWorkspaceCallbackBinder: DefaultWorkspaceCallback 
            )

        }



        if (screen == Screen.LOCK_SCREEN) {

            lifecycleOwner.lifecycleScope.launch {

                lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {

                    launch {
@@ -122,3 +126,4 @@ constructor(private val defaultWorkspaceCallbackBinder: DefaultWorkspaceCallback 
            }

        }

    }

}