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

Commit d00a7cf0 authored by Coco Duan's avatar Coco Duan Committed by Automerger Merge Worker
Browse files

Merge "Fix weather complication disappearing after timer pause" into udc-dev... 

Merge "Fix weather complication disappearing after timer pause" into udc-dev am: ea77c0ef am: 6ccb993a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23517058



Change-Id: I5f5b7bcb0f7d6ac21a86b52491ec40c059f50cbe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4fc317c7 6ccb993a

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(