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

Commit 268bc20b authored by Matt Pietal's avatar Matt Pietal
Browse files

Smartspace - Update fonts/margins 

Remove manual padding in favor of lineHeight. Generally decrease spacing
and font sizes to reduce amount of vertical space being consumed.

Bug: 172360102
Test: manual
Change-Id: I53d2205b2a31c862e1bcb5cdbf7f6c4bd266bec9
parent 9cc2bce0

packages/SystemUI/res-keyguard/values/dimens.xml

+5 −6
Original line number Diff line number Diff line
@@ -47,11 +47,12 @@ 
    <dimen name="eca_overlap">-10dip</dimen>



    <!-- Slice header -->

    <dimen name="widget_title_font_size">24dp</dimen>

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

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

    <dimen name="widget_title_line_height">24dp</dimen>

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

    <!-- Slice subtitle -->

    <dimen name="widget_label_font_size">18dp</dimen>

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

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

    <!-- Clock without header -->

    <dimen name="widget_big_font_size">54dp</dimen>

    <dimen name="bottom_text_spacing_digital">0dp</dimen>
@@ -63,10 +64,8 @@ 
    <dimen name="widget_vertical_padding_clock">12dp</dimen>

    <!-- Subtitle paddings -->

    <dimen name="widget_horizontal_padding">8dp</dimen>

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

    <dimen name="widget_icon_size">18dp</dimen>

    <dimen name="widget_icon_padding">8dp</dimen>

    <dimen name="subtitle_clock_padding">0dp</dimen>

    <dimen name="header_row_font_size">14dp</dimen>

    <!-- Notification shelf padding when dark -->

    <dimen name="widget_bottom_separator_padding">-6dp</dimen>

packages/SystemUI/res-keyguard/values/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ 


    <style name="TextAppearance.Keyguard">

        <item name="android:textSize">@dimen/widget_title_font_size</item>

        <item name="android:lineHeight">@dimen/widget_title_line_height</item>

        <item name="android:gravity">center</item>

        <item name="android:ellipsize">end</item>

        <item name="android:maxLines">2</item>
@@ -133,6 +134,7 @@ 
        <item name="android:layout_height">wrap_content</item>

        <item name="android:lines">1</item>

        <item name="android:textSize">@dimen/widget_label_font_size</item>

        <item name="android:lineHeight">@dimen/widget_label_line_height</item>

    </style>



    <style name="TextAppearance.Keyguard.BottomArea">

packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java

+0 −18
Original line number Diff line number Diff line
@@ -85,10 +85,6 @@ public class KeyguardSliceView extends LinearLayout { 
     */

    private Runnable mContentChangeListener;

    private boolean mHasHeader;

    private final int mRowWithHeaderPadding;

    private final int mRowPadding;

    private float mRowTextSize;

    private float mRowWithHeaderTextSize;

    private View.OnClickListener mOnClickListener;



    private int mLockScreenMode = KeyguardUpdateMonitor.LOCK_SCREEN_MODE_NORMAL;
@@ -97,9 +93,6 @@ public class KeyguardSliceView extends LinearLayout { 
        super(context, attrs);



        Resources resources = context.getResources();

        mRowPadding = resources.getDimensionPixelSize(R.dimen.subtitle_clock_padding);

        mRowWithHeaderPadding = resources.getDimensionPixelSize(R.dimen.header_subtitle_padding);



        mLayoutTransition = new LayoutTransition();

        mLayoutTransition.setStagger(LayoutTransition.CHANGE_APPEARING, DEFAULT_ANIM_DURATION / 2);

        mLayoutTransition.setDuration(LayoutTransition.APPEARING, DEFAULT_ANIM_DURATION);
@@ -120,10 +113,6 @@ public class KeyguardSliceView extends LinearLayout { 
        mTextColor = Utils.getColorAttrDefaultColor(mContext, R.attr.wallpaperTextColor);

        mIconSize = (int) mContext.getResources().getDimension(R.dimen.widget_icon_size);

        mIconSizeWithHeader = (int) mContext.getResources().getDimension(R.dimen.header_icon_size);

        mRowTextSize = mContext.getResources().getDimensionPixelSize(

                R.dimen.widget_label_font_size);

        mRowWithHeaderTextSize = mContext.getResources().getDimensionPixelSize(

                R.dimen.header_row_font_size);

        mTitle.setBreakStrategy(LineBreaker.BREAK_STRATEGY_BALANCED);

    }
@@ -204,7 +193,6 @@ public class KeyguardSliceView extends LinearLayout { 
        LinearLayout.LayoutParams layoutParams = (LayoutParams) mRow.getLayoutParams();

        layoutParams.gravity = mLockScreenMode !=  KeyguardUpdateMonitor.LOCK_SCREEN_MODE_NORMAL

                ? Gravity.START :  Gravity.CENTER;

        layoutParams.topMargin = mHasHeader ? mRowWithHeaderPadding : mRowPadding;

        mRow.setLayoutParams(layoutParams);



        for (int i = startIndex; i < subItemsCount; i++) {
@@ -230,8 +218,6 @@ public class KeyguardSliceView extends LinearLayout { 
            final SliceItem titleItem = rc.getTitleItem();

            button.setText(titleItem == null ? null : titleItem.getText());

            button.setContentDescription(rc.getContentDescription());

            button.setTextSize(TypedValue.COMPLEX_UNIT_PX,

                    mHasHeader ? mRowWithHeaderTextSize : mRowTextSize);



            Drawable iconDrawable = null;

            SliceItem icon = SliceQuery.find(item.getSlice(),
@@ -313,10 +299,6 @@ public class KeyguardSliceView extends LinearLayout { 
    void onDensityOrFontScaleChanged() {

        mIconSize = mContext.getResources().getDimensionPixelSize(R.dimen.widget_icon_size);

        mIconSizeWithHeader = (int) mContext.getResources().getDimension(R.dimen.header_icon_size);

        mRowTextSize = mContext.getResources().getDimensionPixelSize(

                R.dimen.widget_label_font_size);

        mRowWithHeaderTextSize = mContext.getResources().getDimensionPixelSize(

                R.dimen.header_row_font_size);

    }



    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {