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

Commit e911ce09 authored by Michal Brzezinski's avatar Michal Brzezinski
Browse files

Adjusting paddings in ShadeHeader to allow for hover state 

This change is mostly about rearranging paddings and resizing so that in large screen, single line header, border of the shade_header_system_icons is aligned with desired hover state indicator.
There should be no visual changes on handheld.

Bug: 283800652
Bug: 249859409
Test: checking lack of visual changes on small/large screen
Change-Id: I59418bd8280c7e13f4429457cc516aab1b0c3312
parent 094bdb4c

packages/SystemUI/res/layout/combined_qs_header.xml

+6 −4
Original line number Diff line number Diff line
@@ -121,10 +121,12 @@ frame when animating QS <-> QQS transition 
    <LinearLayout

        android:id="@+id/shade_header_system_icons"

        android:layout_width="wrap_content"

        app:layout_constraintHeight_min="@dimen/large_screen_shade_header_min_height"

        android:layout_height="@dimen/large_screen_shade_header_min_height"

        android:layout_height="@dimen/shade_header_system_icons_height"

        android:clickable="true"

        android:orientation="horizontal"

        android:gravity="center_vertical"

        android:paddingStart="@dimen/shade_header_system_icons_padding_start"

        android:paddingEnd="@dimen/shade_header_system_icons_padding_end"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="@id/privacy_container"

        app:layout_constraintTop_toTopOf="@id/clock">
@@ -132,13 +134,13 @@ frame when animating QS <-> QQS transition 
        <com.android.systemui.statusbar.phone.StatusIconContainer

            android:id="@+id/statusIcons"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_height="wrap_content"

            android:paddingEnd="@dimen/signal_cluster_battery_padding" />



        <com.android.systemui.battery.BatteryMeterView

            android:id="@+id/batteryRemainingIcon"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_height="wrap_content"

            app:textAppearance="@style/TextAppearance.QS.Status" />

    </LinearLayout>

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

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ 
    <dimen name="large_dialog_width">472dp</dimen>



    <dimen name="large_screen_shade_header_height">42dp</dimen>

    <!-- start padding is smaller to account for status icon margins coming from drawable itself -->

    <dimen name="shade_header_system_icons_padding_start">11dp</dimen>

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



    <!-- Lockscreen shade transition values -->

    <dimen name="lockscreen_shade_transition_by_tap_distance">200dp</dimen>

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

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ 


    <dimen name="large_screen_shade_header_height">56dp</dimen>



    <!-- it's a bit smaller on 720dp to account for status_bar_icon_horizontal_margin -->

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



    <!-- Biometric Auth pattern view size, better to align keyguard_security_width -->

    <dimen name="biometric_auth_pattern_view_size">348dp</dimen>

</resources>

packages/SystemUI/res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -470,6 +470,10 @@ 
    <dimen name="large_screen_shade_header_height">48dp</dimen>

    <dimen name="large_screen_shade_header_min_height">@dimen/qs_header_row_min_height</dimen>

    <dimen name="large_screen_shade_header_left_padding">@dimen/qs_horizontal_margin</dimen>

    <dimen name="shade_header_system_icons_height">@dimen/large_screen_shade_header_min_height</dimen>

    <dimen name="shade_header_system_icons_height_large_screen">32dp</dimen>

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

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



    <!-- The top margin of the panel that holds the list of notifications.

         On phones it's always 0dp but it's overridden in Car UI

packages/SystemUI/res/xml/large_screen_shade_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
    <Constraint android:id="@+id/shade_header_system_icons">

        <Layout

            android:layout_width="wrap_content"

            android:layout_height="@dimen/large_screen_shade_header_min_height"

            android:layout_height="@dimen/shade_header_system_icons_height_large_screen"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintEnd_toStartOf="@id/privacy_container"

            app:layout_constraintTop_toTopOf="parent"