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

Commit 92e3f280 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Android (Google) Code Review
Browse files

Merge "Adjusting hover state in shade header to new visd" into udc-qpr-dev

parents 682e210e c1bca71d

packages/SystemUI/res/layout/combined_qs_header.xml

+2 −0
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ frame when animating QS <-> QQS transition 
        android:gravity="center_vertical"

        android:paddingStart="@dimen/shade_header_system_icons_padding_start"

        android:paddingEnd="@dimen/shade_header_system_icons_padding_end"

        android:paddingTop="@dimen/shade_header_system_icons_padding_top"

        android:paddingBottom="@dimen/shade_header_system_icons_padding_bottom"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="@id/privacy_container"

        app:layout_constraintTop_toTopOf="@id/clock">

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

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ 
    <!-- start padding is smaller to account for status icon margins coming from drawable itself -->

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

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

    <dimen name="shade_header_system_icons_padding_top">2dp</dimen>

    <dimen name="shade_header_system_icons_padding_bottom">2dp</dimen>



    <!-- Lockscreen shade transition values -->

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

packages/SystemUI/res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -496,9 +496,10 @@ 
    <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>

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

    <dimen name="shade_header_system_icons_padding_bottom">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/shade_header_system_icons_height_large_screen"

            android:layout_height="wrap_content"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintEnd_toStartOf="@id/privacy_container"

            app:layout_constraintTop_toTopOf="parent"

packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt

+4 −2
Original line number Diff line number Diff line
@@ -263,9 +263,11 @@ constructor( 
                    resources.getDimensionPixelSize(

                        R.dimen.shade_header_system_icons_padding_start

                    ),

                    systemIcons.paddingTop,

                    resources.getDimensionPixelSize(R.dimen.shade_header_system_icons_padding_top),

                    resources.getDimensionPixelSize(R.dimen.shade_header_system_icons_padding_end),

                    systemIcons.paddingBottom

                    resources.getDimensionPixelSize(

                        R.dimen.shade_header_system_icons_padding_bottom

                    )

                )

            }