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

Commit f043791d authored by Coco Duan's avatar Coco Duan
Browse files

Fix weather complication disappearing after timer pause 

Noticed weather complication disappearing from dream
after timer was paused while fixing the flickering issue.
Fix is to create a new weather plugin for dream rather
than sharing the same with lockscreen and aod.

Bug: b/285193449
Test: manually
Change-Id: Ide3143558c906ab650e6a295e805adae81eff9bb
parent 5d975e69

packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamSmartspaceController.kt

+2 −2
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ import com.android.systemui.plugins.BcSmartspaceDataPlugin.SmartspaceView 
import com.android.systemui.plugins.BcSmartspaceDataPlugin.UI_SURFACE_DREAM

import com.android.systemui.smartspace.SmartspacePrecondition

import com.android.systemui.smartspace.SmartspaceTargetFilter

import com.android.systemui.smartspace.dagger.SmartspaceModule

import com.android.systemui.smartspace.dagger.SmartspaceModule.Companion.DREAM_SMARTSPACE_DATA_PLUGIN

import com.android.systemui.smartspace.dagger.SmartspaceModule.Companion.DREAM_SMARTSPACE_PRECONDITION

import com.android.systemui.smartspace.dagger.SmartspaceModule.Companion.DREAM_SMARTSPACE_TARGET_FILTER

import com.android.systemui.smartspace.dagger.SmartspaceModule.Companion.DREAM_WEATHER_SMARTSPACE_DATA_PLUGIN

import com.android.systemui.smartspace.dagger.SmartspaceViewComponent

import com.android.systemui.util.concurrency.Execution

import java.util.Optional
@@ -58,7 +58,7 @@ class DreamSmartspaceController @Inject constructor( 
    @Named(DREAM_SMARTSPACE_TARGET_FILTER)

    private val optionalTargetFilter: Optional<SmartspaceTargetFilter>,

    @Named(DREAM_SMARTSPACE_DATA_PLUGIN) optionalPlugin: Optional<BcSmartspaceDataPlugin>,

    @Named(SmartspaceModule.WEATHER_SMARTSPACE_DATA_PLUGIN)

    @Named(DREAM_WEATHER_SMARTSPACE_DATA_PLUGIN)

    optionalWeatherPlugin: Optional<BcSmartspaceDataPlugin>,

) {

    companion object {

packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceModule.kt

+9 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ abstract class SmartspaceModule { 
         */

        const val DREAM_SMARTSPACE_DATA_PLUGIN = "dreams_smartspace_data_plugin"



        /**

         * The BcSmartspaceDataPlugin for the standalone weather on dream.

         */

        const val DREAM_WEATHER_SMARTSPACE_DATA_PLUGIN = "dream_weather_smartspace_data_plugin"



        /**

         * The dream smartspace target filter.

         */
@@ -62,6 +67,10 @@ abstract class SmartspaceModule { 
    @Named(DREAM_SMARTSPACE_DATA_PLUGIN)

    abstract fun optionalDreamsBcSmartspaceDataPlugin(): BcSmartspaceDataPlugin?



    @BindsOptionalOf

    @Named(DREAM_WEATHER_SMARTSPACE_DATA_PLUGIN)

    abstract fun optionalDreamWeatherSmartspaceDataPlugin(): BcSmartspaceDataPlugin?



    @Binds

    @Named(DREAM_SMARTSPACE_PRECONDITION)

    abstract fun bindSmartspacePrecondition(