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

Commit 94298863 authored by Clark Scheff's avatar Clark Scheff
Browse files

SysUI: Fix QS tiles cutting off in the ribbon 

Change I6dbe2d165398a8142e024db827208dc778003431 introduced a bug
where some Tiles would be cropped when certain themes are applied.

This patch resolves that issue.  Also moved the new dimensions to
cm_dimens.xml instead of dimens.xml.

Change-Id: I64e45e83c0edb7101dfd05377376e57ec323cdc1
parent e24fc7be

packages/SystemUI/res/layout/quick_settings_tile_basic.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
        android:layout_marginTop="@dimen/qs_tile_margin_above_icon"

        android:layout_marginBottom="@dimen/qs_tile_margin_below_icon"

        android:layout_width="@dimen/qs_tile_icon_size"

        android:layout_height="@dimen/qs_tile_icon_size"

        android:layout_height="wrap_content"

        android:layout_gravity="top|center_horizontal"

        android:scaleType="centerInside"

        />

packages/SystemUI/res/layout/quick_settings_tile_battery.xml

+9 −2
Original line number Diff line number Diff line
@@ -25,8 +25,15 @@ 
        android:layout_centerHorizontal="true"

        android:layout_gravity="top|center_horizontal"

        android:layout_marginBottom="@dimen/qs_tile_margin_below_icon"

        android:layout_marginTop="@dimen/qs_tile_margin_above_icon"

        android:background="@drawable/ic_qs_battery_bg" >

        android:layout_marginTop="@dimen/qs_tile_margin_above_icon" >



        <ImageView

            android:id="@+id/background"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="top|center_horizontal"

            android:scaleType="centerInside"

            android:src="@drawable/ic_qs_battery_bg" />



        <com.android.systemui.BatteryMeterView

            android:id="@+id/battery"

packages/SystemUI/res/values/cm_dimens.xml

+10 −0
Original line number Diff line number Diff line
@@ -16,4 +16,14 @@ 
-->

<resources>

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



    <!-- Quick Settings tile geometry: width and height (ribbon mode) -->

    <dimen name="qs_ribbon_width_min">40dp</dimen>

    <dimen name="qs_ribbon_width_max">128dp</dimen>

    <dimen name="qs_ribbon_width_big">64dp</dimen>

    <dimen name="qs_ribbon_height_small">40dp</dimen>

    <dimen name="qs_ribbon_height_big">64dp</dimen>

    <!-- Quick Settings tile geometry: interior margin, above and below icon (ribbon mode) -->

    <dimen name="qs_tile_ribbon_icon_margin_small">4dp</dimen>

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

</resources>
 
 No newline at end of file

packages/SystemUI/res/values/dimens.xml

+0 −10
Original line number Diff line number Diff line
@@ -227,14 +227,4 @@ 


    <!-- Padding under status bar battery icon -->

    <dimen name="status_bar_battery_bottom_padding">1px</dimen>



    <!-- Quick Settings tile geometry: width and height (ribbon mode) -->

    <dimen name="qs_ribbon_width_min">40dp</dimen>

    <dimen name="qs_ribbon_width_max">128dp</dimen>

    <dimen name="qs_ribbon_width_big">64dp</dimen>

    <dimen name="qs_ribbon_height_small">40dp</dimen>

    <dimen name="qs_ribbon_height_big">64dp</dimen>

    <!-- Quick Settings tile geometry: interior margin, above and below icon (ribbon mode) -->

    <dimen name="qs_tile_ribbon_icon_margin_small">4dp</dimen>

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

</resources>