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

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

Merge changes Ibe4ba52b,I0a83ce98 into udc-dev 

* changes:
  Handle overlay edge spacing within individual complications layouts.
  Move directional spacing logic out of ViewEntry.
parents 4ccef5d1 2f4e8e92

packages/SystemUI/res/layout/dream_overlay_container.xml

+0 −4
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ 
        android:id="@+id/dream_overlay_content"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:paddingTop="@dimen/dream_overlay_container_padding_top"

        android:paddingEnd="@dimen/dream_overlay_container_padding_end"

        android:paddingBottom="@dimen/dream_overlay_container_padding_bottom"

        android:paddingStart="@dimen/dream_overlay_container_padding_start"

        android:clipToPadding="false"

        android:clipChildren="false"

        app:layout_constraintTop_toBottomOf="@id/dream_overlay_status_bar"

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

+182 −43
Original line number Diff line number Diff line
@@ -16,9 +16,21 @@ 


package com.android.systemui.complication;



import static com.android.systemui.complication.ComplicationLayoutParams.DIRECTION_DOWN;

import static com.android.systemui.complication.ComplicationLayoutParams.DIRECTION_END;

import static com.android.systemui.complication.ComplicationLayoutParams.DIRECTION_START;

import static com.android.systemui.complication.ComplicationLayoutParams.DIRECTION_UP;

import static com.android.systemui.complication.ComplicationLayoutParams.POSITION_BOTTOM;

import static com.android.systemui.complication.ComplicationLayoutParams.POSITION_END;

import static com.android.systemui.complication.ComplicationLayoutParams.POSITION_START;

import static com.android.systemui.complication.ComplicationLayoutParams.POSITION_TOP;

import static com.android.systemui.complication.dagger.ComplicationHostViewModule.COMPLICATIONS_FADE_IN_DURATION;

import static com.android.systemui.complication.dagger.ComplicationHostViewModule.COMPLICATIONS_FADE_OUT_DURATION;

import static com.android.systemui.complication.dagger.ComplicationHostViewModule.COMPLICATION_MARGIN_DEFAULT;

import static com.android.systemui.complication.dagger.ComplicationHostViewModule.COMPLICATION_DIRECTIONAL_SPACING_DEFAULT;

import static com.android.systemui.complication.dagger.ComplicationHostViewModule.COMPLICATION_MARGIN_POSITION_BOTTOM;

import static com.android.systemui.complication.dagger.ComplicationHostViewModule.COMPLICATION_MARGIN_POSITION_END;

import static com.android.systemui.complication.dagger.ComplicationHostViewModule.COMPLICATION_MARGIN_POSITION_START;

import static com.android.systemui.complication.dagger.ComplicationHostViewModule.COMPLICATION_MARGIN_POSITION_TOP;

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



import android.util.Log;
@@ -29,6 +41,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; 
import androidx.constraintlayout.widget.Constraints;



import com.android.systemui.R;

import com.android.systemui.complication.ComplicationLayoutParams.Direction;

import com.android.systemui.complication.ComplicationLayoutParams.Position;

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

import com.android.systemui.statusbar.CrossFadeHelper;
@@ -54,6 +67,47 @@ import javax.inject.Named; 
public class ComplicationLayoutEngine implements Complication.VisibilityController {

    public static final String TAG = "ComplicationLayoutEng";



    /**

     * Container for storing and operating on a tuple of margin values.

     */

    public static class Margins {

        public final int start;

        public final int top;

        public final int end;

        public final int bottom;



        /**

         * Default constructor with all margins set to 0.

         */

        public Margins() {

            this(0, 0, 0, 0);

        }



        /**

         * Cosntructor to specify margin in each direction.

         * @param start start margin

         * @param top top margin

         * @param end end margin

         * @param bottom bottom margin

         */

        public Margins(int start, int top, int end, int bottom) {

            this.start = start;

            this.top = top;

            this.end = end;

            this.bottom = bottom;

        }



        /**

         * Creates a new {@link Margins} by adding the corresponding dimensions together.

         */

        public static Margins combine(Margins margins1, Margins margins2) {

            return new Margins(margins1.start + margins2.start,

                    margins1.top + margins2.top,

                    margins1.end + margins2.end,

                    margins1.bottom + margins2.bottom);

        }

    }



    /**

     * {@link ViewEntry} is an internal container, capturing information necessary for working with

     * a particular {@link Complication} view.
@@ -65,15 +119,13 @@ public class ComplicationLayoutEngine implements Complication.VisibilityControll 
        private final Parent mParent;

        @Complication.Category

        private final int mCategory;

        private final int mDefaultMargin;



        /**

         * Default constructor. {@link Parent} allows for the {@link ViewEntry}'s surrounding

         * view hierarchy to be accessed without traversing the entire view tree.

         */

        ViewEntry(View view, ComplicationLayoutParams layoutParams,

                TouchInsetManager.TouchInsetSession touchSession, int category, Parent parent,

                int defaultMargin) {

                TouchInsetManager.TouchInsetSession touchSession, int category, Parent parent) {

            mView = view;

            // Views that are generated programmatically do not have a unique id assigned to them

            // at construction. A new id is assigned here to enable ConstraintLayout relative
@@ -84,7 +136,6 @@ public class ComplicationLayoutEngine implements Complication.VisibilityControll 
            mTouchInsetSession = touchSession;

            mCategory = category;

            mParent = parent;

            mDefaultMargin = defaultMargin;



            touchSession.addViewToTracking(mView);

        }
@@ -192,23 +243,8 @@ public class ComplicationLayoutEngine implements Complication.VisibilityControll 
                        break;

                }



                if (!isRoot) {

                    final int margin = mLayoutParams.getMargin(mDefaultMargin);

                    switch(direction) {

                        case ComplicationLayoutParams.DIRECTION_DOWN:

                            params.setMargins(0, margin, 0, 0);

                            break;

                        case ComplicationLayoutParams.DIRECTION_UP:

                            params.setMargins(0, 0, 0, margin);

                            break;

                        case ComplicationLayoutParams.DIRECTION_END:

                            params.setMarginStart(margin);

                            break;

                        case ComplicationLayoutParams.DIRECTION_START:

                            params.setMarginEnd(margin);

                            break;

                    }

                }

                final Margins margins = mParent.getMargins(this, isRoot);

                params.setMarginsRelative(margins.start, margins.top, margins.end, margins.bottom);

            });



            if (mLayoutParams.constraintSpecified()) {
@@ -275,7 +311,6 @@ public class ComplicationLayoutEngine implements Complication.VisibilityControll 
            private final ComplicationLayoutParams mLayoutParams;

            private final int mCategory;

            private Parent mParent;

            private int mDefaultMargin;



            Builder(View view, TouchInsetManager.TouchInsetSession touchSession,

                    ComplicationLayoutParams lp, @Complication.Category int category) {
@@ -310,21 +345,11 @@ public class ComplicationLayoutEngine implements Complication.VisibilityControll 
                return this;

            }



            /**

             * Sets the margin that will be applied in the direction the complication is laid out

             * towards.

             */

            Builder setDefaultMargin(int margin) {

                mDefaultMargin = margin;

                return this;

            }



            /**

             * Builds and returns the resulting {@link ViewEntry}.

             */

            ViewEntry build() {

                return new ViewEntry(mView, mLayoutParams, mTouchSession, mCategory, mParent,

                        mDefaultMargin);

                return new ViewEntry(mView, mLayoutParams, mTouchSession, mCategory, mParent);

            }

        }
@@ -336,6 +361,11 @@ public class ComplicationLayoutEngine implements Complication.VisibilityControll 
             * Indicates the {@link ViewEntry} requests removal.

             */

            void removeEntry(ViewEntry entry);



            /**

             * Returns the margins to be applied to the entry

             */

            Margins getMargins(ViewEntry entry, boolean isRoot);

        }

    }
@@ -347,6 +377,15 @@ public class ComplicationLayoutEngine implements Complication.VisibilityControll 
    private static class PositionGroup implements DirectionGroup.Parent {

        private final HashMap<Integer, DirectionGroup> mDirectionGroups = new HashMap<>();



        private final HashMap<Integer, Margins> mDirectionalMargins;



        private final int mDefaultDirectionalSpacing;



        PositionGroup(int defaultDirectionalSpacing, HashMap<Integer, Margins> directionalMargins) {

            mDefaultDirectionalSpacing = defaultDirectionalSpacing;

            mDirectionalMargins = directionalMargins;

        }



        /**

         * Invoked by the {@link PositionGroup} holder to introduce a {@link Complication} view to

         * this group. It is assumed that the caller has correctly identified this
@@ -370,6 +409,26 @@ public class ComplicationLayoutEngine implements Complication.VisibilityControll 
            updateViews();

        }



        @Override

        public int getDefaultDirectionalSpacing() {

            return mDefaultDirectionalSpacing;

        }



        @Override

        public Margins getMargins(ViewEntry entry, boolean isRoot) {

            if (isRoot) {

                Margins cumulativeMargins = new Margins();



                for (Margins margins : mDirectionalMargins.values()) {

                    cumulativeMargins = Margins.combine(margins, cumulativeMargins);

                }



                return cumulativeMargins;

            }



            return mDirectionalMargins.get(entry.getLayoutParams().getDirection());

        }



        private void updateViews() {

            ViewEntry head = null;
@@ -417,14 +476,22 @@ public class ComplicationLayoutEngine implements Complication.VisibilityControll 
             * {@link DirectionGroup}.

             */

            void onEntriesChanged();



            /**

             * Returns the default spacing between elements.

             */

            int getDefaultDirectionalSpacing();



            /**

             * Returns the margins for the view entry.

             */

            Margins getMargins(ViewEntry entry, boolean isRoot);

        }

        private final ArrayList<ViewEntry> mViews = new ArrayList<>();

        private final Parent mParent;



        /**

         * Creates a new {@link DirectionGroup} with the specified parent. Note that the

         * {@link DirectionGroup} does not store its own direction. It is the responsibility of the

         * {@link DirectionGroup.Parent} to maintain this association.

         * Creates a new {@link DirectionGroup} with the specified parent.

         */

        DirectionGroup(Parent parent) {

            mParent = parent;
@@ -463,6 +530,33 @@ public class ComplicationLayoutEngine implements Complication.VisibilityControll 
            mParent.onEntriesChanged();

        }



        @Override

        public Margins getMargins(ViewEntry entry, boolean isRoot) {

            int directionalSpacing = entry.getLayoutParams().getDirectionalSpacing(

                    mParent.getDefaultDirectionalSpacing());



            Margins margins = new Margins();



            if (!isRoot) {

                switch (entry.getLayoutParams().getDirection()) {

                    case ComplicationLayoutParams.DIRECTION_START:

                        margins = new Margins(0, 0, directionalSpacing, 0);

                        break;

                    case ComplicationLayoutParams.DIRECTION_UP:

                        margins = new Margins(0, 0, 0, directionalSpacing);

                        break;

                    case ComplicationLayoutParams.DIRECTION_END:

                        margins = new Margins(directionalSpacing, 0, 0, 0);

                        break;

                    case ComplicationLayoutParams.DIRECTION_DOWN:

                        margins = new Margins(0, directionalSpacing, 0, 0);

                        break;

                }

            }



            return Margins.combine(mParent.getMargins(entry, isRoot), margins);

        }



        /**

         * Invoked by {@link Parent} to update the layout of all children {@link ViewEntry} with

         * the specified head. Note that the head might not be in this group and instead part of a
@@ -484,25 +578,70 @@ public class ComplicationLayoutEngine implements Complication.VisibilityControll 
    }



    private final ConstraintLayout mLayout;

    private final int mDefaultMargin;

    private final int mDefaultDirectionalSpacing;

    private final HashMap<ComplicationId, ViewEntry> mEntries = new HashMap<>();

    private final HashMap<Integer, PositionGroup> mPositions = new HashMap<>();

    private final TouchInsetManager.TouchInsetSession mSession;

    private final int mFadeInDuration;

    private final int mFadeOutDuration;

    private final HashMap<Integer, HashMap<Integer, Margins>> mPositionDirectionMarginMapping;



    /** */

    @Inject

    public ComplicationLayoutEngine(@Named(SCOPED_COMPLICATIONS_LAYOUT) ConstraintLayout layout,

            @Named(COMPLICATION_MARGIN_DEFAULT) int defaultMargin,

            @Named(COMPLICATION_DIRECTIONAL_SPACING_DEFAULT) int defaultDirectionalSpacing,

            @Named(COMPLICATION_MARGIN_POSITION_START) int complicationMarginPositionStart,

            @Named(COMPLICATION_MARGIN_POSITION_TOP) int complicationMarginPositionTop,

            @Named(COMPLICATION_MARGIN_POSITION_END) int complicationMarginPositionEnd,

            @Named(COMPLICATION_MARGIN_POSITION_BOTTOM) int complicationMarginPositionBottom,

            TouchInsetManager.TouchInsetSession session,

            @Named(COMPLICATIONS_FADE_IN_DURATION) int fadeInDuration,

            @Named(COMPLICATIONS_FADE_OUT_DURATION) int fadeOutDuration) {

        mLayout = layout;

        mDefaultMargin = defaultMargin;

        mDefaultDirectionalSpacing = defaultDirectionalSpacing;

        mSession = session;

        mFadeInDuration = fadeInDuration;

        mFadeOutDuration = fadeOutDuration;

        mPositionDirectionMarginMapping = generatePositionDirectionalMarginsMapping(

                complicationMarginPositionStart,

                complicationMarginPositionTop,

                complicationMarginPositionEnd,

                complicationMarginPositionBottom);

    }



    private static HashMap<Integer, HashMap<Integer, Margins>>

            generatePositionDirectionalMarginsMapping(int complicationMarginPositionStart,

            int complicationMarginPositionTop,

            int complicationMarginPositionEnd,

            int complicationMarginPositionBottom) {

        HashMap<Integer, HashMap<Integer, Margins>> mapping = new HashMap<>();



        final Margins startMargins = new Margins(complicationMarginPositionStart, 0, 0, 0);

        final Margins topMargins = new Margins(0, complicationMarginPositionTop, 0, 0);

        final Margins endMargins = new Margins(0, 0, complicationMarginPositionEnd, 0);

        final Margins bottomMargins = new Margins(0, 0, 0, complicationMarginPositionBottom);



        addToMapping(mapping, POSITION_START | POSITION_TOP, DIRECTION_END, topMargins);

        addToMapping(mapping, POSITION_START | POSITION_TOP, DIRECTION_DOWN, startMargins);



        addToMapping(mapping, POSITION_START | POSITION_BOTTOM, DIRECTION_END, bottomMargins);

        addToMapping(mapping, POSITION_START | POSITION_BOTTOM, DIRECTION_UP, startMargins);



        addToMapping(mapping, POSITION_END | POSITION_TOP, DIRECTION_START, topMargins);

        addToMapping(mapping, POSITION_END | POSITION_TOP, DIRECTION_DOWN, endMargins);



        addToMapping(mapping, POSITION_END | POSITION_BOTTOM, DIRECTION_START, bottomMargins);

        addToMapping(mapping, POSITION_END | POSITION_BOTTOM, DIRECTION_UP, endMargins);



        return mapping;

    }



    private static void addToMapping(HashMap<Integer, HashMap<Integer, Margins>> mapping,

            @Position int position, @Direction int direction, Margins margins) {

        if (!mapping.containsKey(position)) {

            mapping.put(position, new HashMap<>());

        }

        mapping.get(position).put(direction, margins);

    }



    @Override
@@ -537,13 +676,13 @@ public class ComplicationLayoutEngine implements Complication.VisibilityControll 
            removeComplication(id);

        }



        final ViewEntry.Builder entryBuilder = new ViewEntry.Builder(view, mSession, lp, category)

                .setDefaultMargin(mDefaultMargin);

        final ViewEntry.Builder entryBuilder = new ViewEntry.Builder(view, mSession, lp, category);



        // Add position group if doesn't already exist

        final int position = lp.getPosition();

        if (!mPositions.containsKey(position)) {

            mPositions.put(position, new PositionGroup());

            mPositions.put(position, new PositionGroup(mDefaultDirectionalSpacing,

                    mPositionDirectionMarginMapping.get(lp.getPosition())));

        }



        // Insert entry into group

packages/SystemUI/src/com/android/systemui/complication/ComplicationLayoutParams.java

+22 −19
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public class ComplicationLayoutParams extends ViewGroup.LayoutParams { 
    private static final int FIRST_POSITION = POSITION_TOP;

    private static final int LAST_POSITION = POSITION_END;



    private static final int MARGIN_UNSPECIFIED = 0xFFFFFFFF;

    private static final int DIRECTIONAL_SPACING_UNSPECIFIED = 0xFFFFFFFF;

    private static final int CONSTRAINT_UNSPECIFIED = 0xFFFFFFFF;



    @Retention(RetentionPolicy.SOURCE)
@@ -80,7 +80,7 @@ public class ComplicationLayoutParams extends ViewGroup.LayoutParams { 


    private final int mWeight;



    private final int mMargin;

    private final int mDirectionalSpacing;



    private final int mConstraint;
@@ -113,8 +113,8 @@ public class ComplicationLayoutParams extends ViewGroup.LayoutParams { 
     */

    public ComplicationLayoutParams(int width, int height, @Position int position,

            @Direction int direction, int weight) {

        this(width, height, position, direction, weight, MARGIN_UNSPECIFIED, CONSTRAINT_UNSPECIFIED,

                false);

        this(width, height, position, direction, weight, DIRECTIONAL_SPACING_UNSPECIFIED,

                CONSTRAINT_UNSPECIFIED, false);

    }



    /**
@@ -127,11 +127,12 @@ public class ComplicationLayoutParams extends ViewGroup.LayoutParams { 
     * @param weight The weight that should be considered for this view when compared to other

     *               views. This has an impact on the placement of the view but not the rendering of

     *               the view.

     * @param margin The margin to apply between complications.

     * @param directionalSpacing The spacing to apply between complications.

     */

    public ComplicationLayoutParams(int width, int height, @Position int position,

            @Direction int direction, int weight, int margin) {

        this(width, height, position, direction, weight, margin, CONSTRAINT_UNSPECIFIED, false);

            @Direction int direction, int weight, int directionalSpacing) {

        this(width, height, position, direction, weight, directionalSpacing, CONSTRAINT_UNSPECIFIED,

                false);

    }



    /**
@@ -144,14 +145,14 @@ public class ComplicationLayoutParams extends ViewGroup.LayoutParams { 
     * @param weight The weight that should be considered for this view when compared to other

     *               views. This has an impact on the placement of the view but not the rendering of

     *               the view.

     * @param margin The margin to apply between complications.

     * @param directionalSpacing The spacing to apply between complications.

     * @param constraint The max width or height the complication is allowed to spread, depending on

     *                   its direction. For horizontal directions, this would be applied on width,

     *                   and for vertical directions, height.

     */

    public ComplicationLayoutParams(int width, int height, @Position int position,

            @Direction int direction, int weight, int margin, int constraint) {

        this(width, height, position, direction, weight, margin, constraint, false);

            @Direction int direction, int weight, int directionalSpacing, int constraint) {

        this(width, height, position, direction, weight, directionalSpacing, constraint, false);

    }



    /**
@@ -172,8 +173,8 @@ public class ComplicationLayoutParams extends ViewGroup.LayoutParams { 
     */

    public ComplicationLayoutParams(int width, int height, @Position int position,

            @Direction int direction, int weight, boolean snapToGuide) {

        this(width, height, position, direction, weight, MARGIN_UNSPECIFIED, CONSTRAINT_UNSPECIFIED,

                snapToGuide);

        this(width, height, position, direction, weight, DIRECTIONAL_SPACING_UNSPECIFIED,

                CONSTRAINT_UNSPECIFIED, snapToGuide);

    }



    /**
@@ -186,7 +187,7 @@ public class ComplicationLayoutParams extends ViewGroup.LayoutParams { 
     * @param weight The weight that should be considered for this view when compared to other

     *               views. This has an impact on the placement of the view but not the rendering of

     *               the view.

     * @param margin The margin to apply between complications.

     * @param directionalSpacing The spacing to apply between complications.

     * @param constraint The max width or height the complication is allowed to spread, depending on

     *                   its direction. For horizontal directions, this would be applied on width,

     *                   and for vertical directions, height.
@@ -197,7 +198,8 @@ public class ComplicationLayoutParams extends ViewGroup.LayoutParams { 
     *                    from the end of the parent to the guide.

     */

    public ComplicationLayoutParams(int width, int height, @Position int position,

            @Direction int direction, int weight, int margin, int constraint, boolean snapToGuide) {

            @Direction int direction, int weight, int directionalSpacing, int constraint,

            boolean snapToGuide) {

        super(width, height);



        if (!validatePosition(position)) {
@@ -213,7 +215,7 @@ public class ComplicationLayoutParams extends ViewGroup.LayoutParams { 


        mWeight = weight;



        mMargin = margin;

        mDirectionalSpacing = directionalSpacing;



        mConstraint = constraint;
@@ -228,7 +230,7 @@ public class ComplicationLayoutParams extends ViewGroup.LayoutParams { 
        mPosition = source.mPosition;

        mDirection = source.mDirection;

        mWeight = source.mWeight;

        mMargin = source.mMargin;

        mDirectionalSpacing = source.mDirectionalSpacing;

        mConstraint = source.mConstraint;

        mSnapToGuide = source.mSnapToGuide;

    }
@@ -300,11 +302,12 @@ public class ComplicationLayoutParams extends ViewGroup.LayoutParams { 
    }



    /**

     * Returns the margin to apply between complications, or the given default if no margin is

     * Returns the spacing to apply between complications, or the given default if no spacing is

     * specified.

     */

    public int getMargin(int defaultMargin) {

        return mMargin == MARGIN_UNSPECIFIED ? defaultMargin : mMargin;

    public int getDirectionalSpacing(int defaultSpacing) {

        return mDirectionalSpacing == DIRECTIONAL_SPACING_UNSPECIFIED

                ? defaultSpacing : mDirectionalSpacing;

    }



    /**

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

+35 −2
Original line number Diff line number Diff line
@@ -36,11 +36,20 @@ import javax.inject.Named; 
@Module

public abstract class ComplicationHostViewModule {

    public static final String SCOPED_COMPLICATIONS_LAYOUT = "scoped_complications_layout";

    public static final String COMPLICATION_MARGIN_DEFAULT = "complication_margin_default";

    public static final String COMPLICATION_DIRECTIONAL_SPACING_DEFAULT =

            "complication_directional_spacing_default";

    public static final String COMPLICATIONS_FADE_OUT_DURATION = "complications_fade_out_duration";

    public static final String COMPLICATIONS_FADE_IN_DURATION = "complications_fade_in_duration";

    public static final String COMPLICATIONS_RESTORE_TIMEOUT = "complication_restore_timeout";

    public static final String COMPLICATIONS_FADE_OUT_DELAY = "complication_fade_out_delay";

    public static final String COMPLICATION_MARGIN_POSITION_START =

            "complication_margin_position_start";

    public static final String COMPLICATION_MARGIN_POSITION_TOP =

            "complication_margin_position_top";

    public static final String COMPLICATION_MARGIN_POSITION_END =

            "complication_margin_position_end";

    public static final String COMPLICATION_MARGIN_POSITION_BOTTOM =

            "complication_margin_position_bottom";



    /**

     * Generates a {@link ConstraintLayout}, which can host
@@ -58,11 +67,35 @@ public abstract class ComplicationHostViewModule { 
    }



    @Provides

    @Named(COMPLICATION_MARGIN_DEFAULT)

    @Named(COMPLICATION_DIRECTIONAL_SPACING_DEFAULT)

    static int providesComplicationPadding(@Main Resources resources) {

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

    }



    @Provides

    @Named(COMPLICATION_MARGIN_POSITION_START)

    static int providesComplicationMarginPositionStart(@Main Resources resources) {

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

    }



    @Provides

    @Named(COMPLICATION_MARGIN_POSITION_TOP)

    static int providesComplicationMarginPositionTop(@Main Resources resources) {

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

    }



    @Provides

    @Named(COMPLICATION_MARGIN_POSITION_END)

    static int providesComplicationMarginPositionEnd(@Main Resources resources) {

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

    }



    @Provides

    @Named(COMPLICATION_MARGIN_POSITION_BOTTOM)

    static int providesComplicationMarginPositionBottom(@Main Resources resources) {

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

    }



    /**

     * Provides the fade out duration for complications.

     */

packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationLayoutEngineTest.java

+89 −24

File changed.

Preview size limit exceeded, changes collapsed.