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

Commit 6ef8942e authored by Alex Stetson's avatar Alex Stetson Committed by Android (Google) Code Review
Browse files

Merge "Remove complication duplication" into main

parents 795fb0a3 71c02c1c

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt

+5 −8
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import com.android.systemui.complication.ComplicationHostViewController 
import com.android.systemui.complication.ComplicationLayoutEngine

import com.android.systemui.complication.dagger.ComplicationComponent

import com.android.systemui.dreams.complication.HideComplicationTouchHandler

import com.android.systemui.dreams.complication.dagger.DreamComplicationComponent

import com.android.systemui.dreams.dagger.DreamOverlayComponent

import com.android.systemui.dreams.touch.CommunalTouchHandler

import com.android.systemui.flags.andSceneContainer
@@ -119,8 +120,7 @@ class DreamOverlayServiceTest(flags: FlagsParameterization?) : SysuiTestCase() { 
    private val mComplicationComponentFactory = mock<ComplicationComponent.Factory>()

    private val mComplicationHostViewController = mock<ComplicationHostViewController>()

    private val mComplicationVisibilityController = mock<ComplicationLayoutEngine>()

    private val mDreamComplicationComponentFactory =

        mock<com.android.systemui.dreams.complication.dagger.ComplicationComponent.Factory>()

    private val mDreamComplicationComponentFactory = mock<DreamComplicationComponent.Factory>()

    private val mHideComplicationTouchHandler = mock<HideComplicationTouchHandler>()

    private val mDreamOverlayComponentFactory = mock<DreamOverlayComponent.Factory>()

    private val mCommunalTouchHandler = mock<CommunalTouchHandler>()
@@ -160,8 +160,7 @@ class DreamOverlayServiceTest(flags: FlagsParameterization?) : SysuiTestCase() { 
    private lateinit var mService: DreamOverlayService



    private class EnvironmentComponents(

        val dreamsComplicationComponent:

            com.android.systemui.dreams.complication.dagger.ComplicationComponent,

        val dreamsComplicationComponent: DreamComplicationComponent,

        val dreamOverlayComponent: DreamOverlayComponent,

        val complicationComponent: ComplicationComponent,

        val ambientTouchComponent: AmbientTouchComponent,
@@ -186,8 +185,7 @@ class DreamOverlayServiceTest(flags: FlagsParameterization?) : SysuiTestCase() { 
    }



    private fun setupComponentFactories(

        dreamComplicationComponentFactory:

            com.android.systemui.dreams.complication.dagger.ComplicationComponent.Factory,

        dreamComplicationComponentFactory: DreamComplicationComponent.Factory,

        dreamOverlayComponentFactory: DreamOverlayComponent.Factory,

        complicationComponentFactory: ComplicationComponent.Factory,

        ambientTouchComponentFactory: AmbientTouchComponent.Factory,
@@ -208,8 +206,7 @@ class DreamOverlayServiceTest(flags: FlagsParameterization?) : SysuiTestCase() { 
        whenever(complicationComponent.getVisibilityController())

            .thenReturn(mComplicationVisibilityController)



        val dreamComplicationComponent =

            mock<com.android.systemui.dreams.complication.dagger.ComplicationComponent>()

        val dreamComplicationComponent = mock<DreamComplicationComponent>()

        whenever(dreamComplicationComponent.getHideComplicationTouchHandler())

            .thenReturn(mHideComplicationTouchHandler)

        whenever(dreamOverlayComponent.communalTouchHandler).thenReturn(mCommunalTouchHandler)

packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java

+6 −7
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import com.android.systemui.communal.shared.model.CommunalScenes; 
import com.android.systemui.communal.shared.model.CommunalTransitionKeys;

import com.android.systemui.complication.dagger.ComplicationComponent;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dreams.complication.dagger.DreamComplicationComponent;

import com.android.systemui.dreams.dagger.DreamOverlayComponent;

import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;

import com.android.systemui.navigationbar.gestural.domain.GestureInteractor;
@@ -141,8 +142,7 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ 
     */

    private boolean mBouncerShowing = false;



    private final com.android.systemui.dreams.complication.dagger.ComplicationComponent.Factory

            mDreamComplicationComponentFactory;

    private final DreamComplicationComponent.Factory mDreamComplicationComponentFactory;

    private final ComplicationComponent.Factory mComplicationComponentFactory;

    private final DreamOverlayComponent.Factory mDreamOverlayComponentFactory;

    private final AmbientTouchComponent.Factory mAmbientTouchComponentFactory;
@@ -376,8 +376,7 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ 
            @Main DelayableExecutor executor,

            ViewCaptureAwareWindowManager viewCaptureAwareWindowManager,

            ComplicationComponent.Factory complicationComponentFactory,

            com.android.systemui.dreams.complication.dagger.ComplicationComponent.Factory

                    dreamComplicationComponentFactory,

            DreamComplicationComponent.Factory dreamComplicationComponentFactory,

            DreamOverlayComponent.Factory dreamOverlayComponentFactory,

            AmbientTouchComponent.Factory ambientTouchComponentFactory,

            DreamOverlayStateController stateController,
@@ -479,8 +478,8 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ 
                mLifecycleOwner,

                () -> mExecutor.execute(DreamOverlayService.this::requestExit),

                new ViewModelStore(), mTouchInsetManager);

        final com.android.systemui.dreams.complication.dagger.ComplicationComponent

                dreamComplicationComponent = mDreamComplicationComponentFactory.create(

        final DreamComplicationComponent dreamComplicationComponent =

                mDreamComplicationComponentFactory.create(

                        complicationComponent.getVisibilityController(), mTouchInsetManager);



        final DreamOverlayComponent dreamOverlayComponent = mDreamOverlayComponentFactory.create(

packages/SystemUI/src/com/android/systemui/dreams/complication/HideComplicationTouchHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package com.android.systemui.dreams.complication;



import static com.android.systemui.Flags.removeDreamOverlayHideOnTouch;

import static com.android.systemui.dreams.complication.dagger.ComplicationModule.COMPLICATIONS_FADE_OUT_DELAY;

import static com.android.systemui.dreams.complication.dagger.ComplicationModule.COMPLICATIONS_RESTORE_TIMEOUT;

import static com.android.systemui.dreams.complication.dagger.DreamComplicationModule.COMPLICATIONS_FADE_OUT_DELAY;

import static com.android.systemui.dreams.complication.dagger.DreamComplicationModule.COMPLICATIONS_RESTORE_TIMEOUT;



import android.util.Log;

import android.view.MotionEvent;

packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationComponent.kt→packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamComplicationComponent.kt

+5 −5
Original line number Diff line number Diff line
@@ -6,15 +6,15 @@ import com.android.systemui.touch.TouchInsetManager 
import dagger.BindsInstance

import dagger.Subcomponent



@Subcomponent(modules = [ComplicationModule::class])

interface ComplicationComponent {

    /** Factory for generating [ComplicationComponent]. */

@Subcomponent(modules = [DreamComplicationModule::class])

interface DreamComplicationComponent {

    /** Factory for generating [DreamComplicationComponent]. */

    @Subcomponent.Factory

    interface Factory {

        fun create(

            @BindsInstance visibilityController: Complication.VisibilityController,

            @BindsInstance touchInsetManager: TouchInsetManager

        ): ComplicationComponent

            @BindsInstance touchInsetManager: TouchInsetManager,

        ): DreamComplicationComponent

    }



    fun getHideComplicationTouchHandler(): HideComplicationTouchHandler

packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationModule.kt→packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamComplicationModule.kt

+2 −2
Original line number Diff line number Diff line 
package com.android.systemui.dreams.complication.dagger



import android.content.res.Resources

import com.android.systemui.res.R

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.res.R

import dagger.Module

import dagger.Provides

import javax.inject.Named



@Module

object ComplicationModule {

object DreamComplicationModule {

    const val COMPLICATIONS_RESTORE_TIMEOUT = "complication_restore_timeout"

    const val COMPLICATIONS_FADE_OUT_DELAY = "complication_fade_out_delay"