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

Commit e5874747 authored by Amin Shaikh's avatar Amin Shaikh Committed by android-build-merger
Browse files

Merge "QQS visual fixes." into pi-dev am: 032ab152 

am: eeedbb5a

Change-Id: Ia2d8ab61124b8096d05f68c23ac389c97615249c
parents f2350978 eeedbb5a

packages/SystemUI/res/layout/quick_qs_status_icons.xml

+6 −4
Original line number Diff line number Diff line
@@ -18,13 +18,15 @@ 
    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:id="@+id/quick_qs_status_icons"

    android:layout_width="match_parent"

    android:layout_height="20dp"

    android:layout_height="wrap_content"

    android:layout_marginTop="8dp"

    android:layout_marginBottom="14dp"

    android:layout_marginStart="8dp"

    android:layout_marginEnd="@dimen/notification_side_paddings"

    android:layout_marginStart="@dimen/status_bar_padding_start"

    android:layout_marginEnd="@dimen/status_bar_padding_end"

    android:layout_below="@id/quick_status_bar_system_icons"

    android:paddingEnd="@dimen/status_bar_padding_end" >

    android:clipChildren="false"

    android:clipToPadding="false"

    android:minHeight="20dp" >



    <com.android.systemui.statusbar.policy.DateView

        android:id="@+id/date"

packages/SystemUI/res/layout/quick_settings_header_info.xml

+10 −5
Original line number Diff line number Diff line
@@ -45,14 +45,16 @@ 
            android:layout_width="@dimen/qs_header_alarm_icon_size"

            android:layout_height="@dimen/qs_header_alarm_icon_size"

            android:src="@drawable/stat_sys_alarm"

            android:tint="?android:attr/textColorPrimary" />

            android:tint="?android:attr/textColorPrimary"

            android:visibility="gone"/>



        <TextView

            android:id="@+id/next_alarm_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/qs_header_alarm_text_margin_start"

            android:textAppearance="@style/TextAppearance.QS.TileLabel" />

            android:textAppearance="@style/TextAppearance.QS.TileLabel"

            android:visibility="gone"/>



        <View

            android:id="@+id/status_separator"
@@ -61,20 +63,23 @@ 
            android:layout_marginStart="10dp"

            android:layout_marginEnd="10dp"

            android:background="@android:color/white"

            android:backgroundTint="?android:attr/textColorPrimary" />

            android:backgroundTint="?android:attr/textColorPrimary"

            android:visibility="gone"/>



        <ImageView

            android:id="@+id/ringer_mode_icon"

            android:layout_width="@dimen/qs_header_alarm_icon_size"

            android:layout_height="@dimen/qs_header_alarm_icon_size"

            android:tint="?android:attr/textColorPrimary" />

            android:tint="?android:attr/textColorPrimary"

            android:visibility="gone"/>



        <TextView

            android:id="@+id/ringer_mode_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/qs_header_alarm_text_margin_start"

            android:textAppearance="@style/TextAppearance.QS.TileLabel" />

            android:textAppearance="@style/TextAppearance.QS.TileLabel"

            android:visibility="gone"/>



    </LinearLayout>

packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml

+2 −5
Original line number Diff line number Diff line
@@ -20,15 +20,12 @@ 
    android:id="@+id/quick_status_bar_system_icons"

    android:layout_width="match_parent"

    android:layout_height="@*android:dimen/quick_qs_offset_height"

    android:layout_marginRight="@dimen/notification_side_paddings"

    android:layout_marginLeft="@dimen/notification_side_paddings"

    android:layout_alignParentEnd="true"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:gravity="center"

    android:orientation="horizontal"

    android:paddingStart="@dimen/status_bar_padding_start"

    android:paddingEnd="@dimen/status_bar_padding_end"

    android:orientation="horizontal">

    android:paddingEnd="@dimen/status_bar_padding_end" >



    <com.android.systemui.statusbar.policy.Clock

        android:id="@+id/clock"

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ 
    <dimen name="pull_span_min">25dp</dimen>



    <dimen name="qs_tile_height">106dp</dimen>

    <dimen name="qs_tile_layout_margin_side">9dp</dimen>

    <dimen name="qs_tile_layout_margin_side">6dp</dimen>

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

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

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

packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public class QSContainerImpl extends FrameLayout { 
    private int mHeightOverride = -1;

    private QSPanel mQSPanel;

    private View mQSDetail;

    private View mHeader;

    private QuickStatusBarHeader mHeader;

    private float mQsExpansion;

    private QSCustomizer mQSCustomizer;

    private View mQSFooter;
@@ -178,7 +178,7 @@ public class QSContainerImpl extends FrameLayout { 
        setMargins(mBackground);

        setMargins(mQSFooter);

        mQSPanel.setMargins(mSideMargins);

        setMargins(mHeader);

        mHeader.setMargins(mSideMargins);

    }



    private void setMargins(View view) {