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

Commit 73d252fd authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Set tiles padding and margins 

Also, simplify the icon hierarchy.

Test: manual
Bug: 181673785
Change-Id: I6ebf3825fedd2c1e9c6e83b3b5d3b7d0766fec7e
parent afd39fc5

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -530,6 +530,8 @@ 
    <dimen name="qs_tile_margin_top">0dp</dimen>

    <dimen name="qs_tile_icon_background_stroke_width">-1dp</dimen>

    <dimen name="qs_tile_background_size">44dp</dimen>

    <dimen name="qs_icon_size">20dp</dimen>

    <dimen name="qs_label_container_margin">10dp</dimen>

    <dimen name="qs_quick_tile_size">48dp</dimen>

    <dimen name="qs_quick_tile_padding">12dp</dimen>

    <dimen name="qs_header_gear_translation">16dp</dimen>

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class QSTileBaseView extends com.android.systemui.plugins.qs.QSTileView { 
    private static final int ICON_MASK_ID = com.android.internal.R.string.config_icon_mask;

    protected final Handler mHandler = new H();

    private final int[] mLocInScreen = new int[2];

    private final FrameLayout mIconFrame;

    protected final FrameLayout mIconFrame;

    protected QSIconView mIcon;

    protected RippleDrawable mRipple;

    protected Drawable mTileBackground;

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewHorizontal.kt

+13 −2
Original line number Diff line number Diff line
@@ -46,7 +46,15 @@ open class QSTileViewHorizontal( 
        orientation = HORIZONTAL

        gravity = Gravity.CENTER_VERTICAL or Gravity.START

        mDualTargetAllowed = false

        val padding = context.resources.getDimensionPixelSize(R.dimen.qs_tile_side_label_padding)

        setPadding(padding, paddingTop, padding, paddingBottom)



        mBg.setImageDrawable(null)

        mIconFrame.removeAllViews()

        removeView(mIconFrame)

        val iconSize = context.resources.getDimensionPixelSize(R.dimen.qs_icon_size)

        addView(mIcon, 0, LayoutParams(iconSize, iconSize))



        mColorLabelActive = ColorStateList.valueOf(getColorForState(getContext(), STATE_ACTIVE))

    }
@@ -58,12 +66,15 @@ open class QSTileViewHorizontal( 
                removeRule(RelativeLayout.ALIGN_PARENT_TOP)

            }

        }

        mLabelContainer.setPadding(0, 0, 0, 0)

        (mLabelContainer.layoutParams as MarginLayoutParams).apply {

            marginStart = context.resources.getDimensionPixelSize(R.dimen.qs_label_container_margin)

        }

        mLabel.gravity = Gravity.START

        mLabel.textDirection = TEXT_DIRECTION_LOCALE

        mSecondLine.gravity = Gravity.START

        mSecondLine.textDirection = TEXT_DIRECTION_LOCALE

        val padding = context.resources.getDimensionPixelSize(R.dimen.qs_tile_side_label_padding)

        mLabelContainer.setPaddingRelative(0, padding, padding, padding)



        (mLabelContainer.layoutParams as LayoutParams).gravity =

            Gravity.CENTER_VERTICAL or Gravity.START

        if (mCollapsedView) {