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

Commit e19335a4 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Visual changes to QS header" into qt-dev

parents 4c916ecf bca09b7c

packages/SystemUI/res/layout/quick_qs_status_icons.xml

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
        android:layout_gravity="start"

        android:gravity="center_vertical"

        android:singleLine="true"

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

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

        systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />



    <com.android.systemui.statusbar.phone.StatusIconContainer
@@ -51,6 +51,7 @@ 
        android:id="@+id/batteryRemainingIcon"

        android:layout_height="match_parent"

        android:layout_width="wrap_content"

        systemui:textAppearance="@style/TextAppearance.QS.Status"

        android:paddingEnd="2dp" />



</LinearLayout>

packages/SystemUI/res/layout/system_icons.xml

+3 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
  -->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

              xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:id="@+id/system_icons"

    android:layout_width="match_parent"

    android:layout_height="match_parent"
@@ -32,5 +33,6 @@ 
        android:layout_height="match_parent"

        android:layout_width="wrap_content"

        android:clipToPadding="false"

        android:clipChildren="false" />

        android:clipChildren="false"

        systemui:textAppearance="@style/TextAppearance.StatusBar.Clock" />

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
    <attr name="frameColor" format="color" />

    <declare-styleable name="BatteryMeterView">

        <attr name="frameColor" />

        <attr name="textAppearance" format="reference"/>

    </declare-styleable>

    <declare-styleable name="Clock">

        <attr name="amPmStyle" format="enum">

packages/SystemUI/res/values/dimens.xml

+1 −3
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ 
    <!-- The height of the qs customize header. Should be (28dp - qs_tile_margin_top_bottom). -->

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

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

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

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

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

    <!-- Maximum width of quick quick settings panel. Defaults to MATCH_PARENT-->

    <dimen name="qs_quick_layout_width">-1px</dimen>
@@ -424,7 +424,6 @@ 
    <dimen name="qs_page_indicator_height">8dp</dimen>

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

    <dimen name="qs_tile_text_size">12sp</dimen>

    <dimen name="qs_carrier_info_text_size">14sp</dimen>

    <dimen name="qs_tile_divider_height">1dp</dimen>

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

    <dimen name="qs_dual_tile_height">112dp</dimen>
@@ -432,7 +431,6 @@ 
    <dimen name="qs_dual_tile_padding_horizontal">6dp</dimen>

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

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

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

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

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

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

packages/SystemUI/res/values/styles.xml

+2 −5
Original line number Diff line number Diff line
@@ -222,13 +222,10 @@ 
        <item name="android:textSize">@dimen/celltile_rat_type_size</item>

    </style>



    <style name="TextAppearance.QS.CarrierInfo">

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

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

    <style name="TextAppearance.QS.Status" parent="TextAppearance.QS.TileLabel.Secondary">

        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>

    </style>



    <style name="TextAppearance.QS.Status" parent="TextAppearance.QS.TileLabel.Secondary" />



    <style name="TextAppearance.AppOpsDialog" />



    <style name="TextAppearance.AppOpsDialog.Title">