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

Commit a970d6fe authored by Bryce Lee's avatar Bryce Lee
Browse files

Remove ComplicationHostViewComponent. 

This changelist removes ComplicationHostViewComponent. No additional bound instances were introduced by this ComplicationHostViewComponent, leading to unnecessary scoping.

Bug: 214292772
Test: atest DreamOverlayContainerViewControllerTest
Change-Id: I802cd9308733ed8e0b84737a62bd65638df53ec6
parent 92748079

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

+2 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.systemui.R;

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

import com.android.systemui.dreams.complication.ComplicationHostViewController;

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

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

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

import com.android.systemui.util.ViewController;
@@ -69,7 +68,7 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve 
    @Inject

    public DreamOverlayContainerViewController(

            DreamOverlayContainerView containerView,

            ComplicationHostViewComponent.Factory complicationHostViewFactory,

            ComplicationHostViewController complicationHostViewController,

            @Named(DreamOverlayModule.DREAM_OVERLAY_CONTENT_VIEW) ViewGroup contentView,

            DreamOverlayStatusBarViewController statusBarViewController,

            @Main Handler handler,
@@ -84,7 +83,7 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve 
                mView.getResources().getDimensionPixelSize(

                        R.dimen.dream_overlay_notifications_drag_area_height);



        mComplicationHostViewController = complicationHostViewFactory.create().getController();

        mComplicationHostViewController = complicationHostViewController;

        final View view = mComplicationHostViewController.getView();



        mDreamOverlayContentView.addView(view,

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.systemui.dreams.complication;



import static com.android.systemui.dreams.complication.dagger.ComplicationHostViewComponent.SCOPED_COMPLICATIONS_LAYOUT;

import static com.android.systemui.dreams.complication.dagger.ComplicationHostViewModule.SCOPED_COMPLICATIONS_LAYOUT;

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



import android.graphics.Rect;

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

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package com.android.systemui.dreams.complication;



import static com.android.systemui.dreams.complication.dagger.ComplicationHostViewComponent.COMPLICATION_MARGIN;

import static com.android.systemui.dreams.complication.dagger.ComplicationHostViewComponent.SCOPED_COMPLICATIONS_LAYOUT;

import static com.android.systemui.dreams.complication.dagger.ComplicationHostViewModule.COMPLICATION_MARGIN;

import static com.android.systemui.dreams.complication.dagger.ComplicationHostViewModule.SCOPED_COMPLICATIONS_LAYOUT;



import android.util.Log;

import android.view.View;

packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationHostViewComponent.java→packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationHostViewModule.java

+63 −0
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.systemui.dreams.complication.dagger;



import static java.lang.annotation.RetentionPolicy.RUNTIME;



import android.content.res.Resources;

import android.view.LayoutInflater;
@@ -26,60 +24,28 @@ import androidx.constraintlayout.widget.ConstraintLayout; 
import com.android.internal.util.Preconditions;

import com.android.systemui.R;

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

import com.android.systemui.dreams.complication.ComplicationHostViewController;



import java.lang.annotation.Documented;

import java.lang.annotation.Retention;

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



import javax.inject.Named;

import javax.inject.Scope;



import dagger.Module;

import dagger.Provides;

import dagger.Subcomponent;



/**

 * {@link ComplicationHostViewComponent} encapsulates the shared logic around the host view layer

 * for complications. Anything that references the layout should be provided through this component

 * and its child module. The factory should be used in order to best tie the lifetime of the view

 * to components.

 */

@Subcomponent(modules = {

        ComplicationHostViewComponent.ComplicationHostViewModule.class,

})

@ComplicationHostViewComponent.ComplicationHostViewScope

public interface ComplicationHostViewComponent {

    String SCOPED_COMPLICATIONS_LAYOUT = "scoped_complications_layout";

    String COMPLICATION_MARGIN = "complication_margin";

    /** Scope annotation for singleton items within {@link ComplicationHostViewComponent}. */

    @Documented

    @Retention(RUNTIME)

    @Scope

    @interface ComplicationHostViewScope {}



    /**

     * Factory for generating a new scoped component.

     */

    @Subcomponent.Factory

    interface Factory {

        ComplicationHostViewComponent create();

    }



    /** */

    ComplicationHostViewController getController();



/**

 * Module for providing a scoped host view.

 */

@Module

    abstract class ComplicationHostViewModule {

public abstract class ComplicationHostViewModule {

    public static final String SCOPED_COMPLICATIONS_LAYOUT = "scoped_complications_layout";

    public static final String COMPLICATION_MARGIN = "complication_margin";



    /**

     * Generates a {@link ConstraintLayout}, which can host

     * {@link com.android.systemui.dreams.complication.Complication} instances.

     */

    @Provides

    @Named(SCOPED_COMPLICATIONS_LAYOUT)

        @ComplicationHostViewScope

    @DreamOverlayComponent.DreamOverlayScope

    static ConstraintLayout providesComplicationHostView(

            LayoutInflater layoutInflater) {

        return Preconditions.checkNotNull((ConstraintLayout)
@@ -90,9 +56,8 @@ public interface ComplicationHostViewComponent { 


    @Provides

    @Named(COMPLICATION_MARGIN)

        @ComplicationHostViewScope

    @DreamOverlayComponent.DreamOverlayScope

    static int providesComplicationPadding(@Main Resources resources) {

        return resources.getDimensionPixelSize(R.dimen.dream_overlay_complication_margin);

    }

}
 
}

packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationModule.java

+3 −2
Original line number Diff line number Diff line
@@ -35,9 +35,10 @@ import dagger.Provides; 
/**

 * Module for housing components related to rendering complications.

 */

@Module(subcomponents = {

@Module(includes = {

        ComplicationHostViewModule.class,

        }, subcomponents = {

        ComplicationViewModelComponent.class,

        ComplicationHostViewComponent.class,

})

public interface ComplicationModule {

    String SCOPED_COMPLICATIONS_MODEL = "scoped_complications_model";