diff options
| author | 2023-06-02 16:51:17 +0000 | |
|---|---|---|
| committer | 2023-06-02 16:51:17 +0000 | |
| commit | ea77c0ef4cc61d7322015c675f63bb6231b24d3a (patch) | |
| tree | b6a4dd0b31b45589e22feca34903a4a111289803 | |
| parent | 811aeb73933a70fee83122e8a03e116bcc338077 (diff) | |
| parent | f043791d74bba08a3e5853bb73301c59f59a9d2a (diff) | |
Merge "Fix weather complication disappearing after timer pause" into udc-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamSmartspaceController.kt | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceModule.kt | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamSmartspaceController.kt b/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamSmartspaceController.kt index 78e132ff6397..4b297a3d321d 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamSmartspaceController.kt +++ b/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamSmartspaceController.kt @@ -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 { diff --git a/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceModule.kt b/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceModule.kt index 641131e4dcc1..03be88fc31d9 100644 --- a/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceModule.kt +++ b/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceModule.kt @@ -34,6 +34,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. */ const val DREAM_SMARTSPACE_TARGET_FILTER = "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( |