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

Commit 235e59d6 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge changes from topic "378111815-complications" into main 

* changes:
  Add clock to the base supported complications set.
  Add base dream complication dependencies.
parents 5c4c8022 9ab2bbaa

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -2731,6 +2731,8 @@ 
    </string-array>

    <!-- The list of supported dream complications -->

    <integer-array name="config_supportedDreamComplications">

        <!-- COMPLICATION_TYPE_TIME -->

        <item>1</item>

    </integer-array>



    <!-- Are we allowed to dream while not plugged in? -->

packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt

+16 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import com.android.systemui.back.domain.interactor.BackActionInteractor 
import com.android.systemui.biometrics.BiometricNotificationService

import com.android.systemui.bouncer.domain.startable.BouncerStartable

import com.android.systemui.clipboardoverlay.ClipboardListener

import com.android.systemui.complication.ComplicationTypesUpdater

import com.android.systemui.complication.DreamClockTimeComplication

import com.android.systemui.controls.dagger.StartControlsStartableModule

import com.android.systemui.dagger.qualifiers.PerUser

import com.android.systemui.dreams.AssistantAttentionMonitor
@@ -337,4 +339,18 @@ abstract class SystemUICoreStartableModule { 
    abstract fun bindDreamOverlayRegistrant(

        dreamOverlayRegistrant: DreamOverlayRegistrant

    ): CoreStartable



    /** Inject into DreamClockTimeComplication.Registrant */

    @Binds

    @IntoMap

    @ClassKey(DreamClockTimeComplication.Registrant::class)

    abstract fun bindDreamClockTimeComplicationRegistrant(

        registrant: DreamClockTimeComplication.Registrant

    ): CoreStartable



    /** Inject into ComplicationTypesUpdater. */

    @Binds

    @IntoMap

    @ClassKey(ComplicationTypesUpdater::class)

    abstract fun bindComplicationTypesUpdater(updater: ComplicationTypesUpdater): CoreStartable

}