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

Commit 520d2fc1 authored by Jason Monk's avatar Jason Monk
Browse files

resolve merge conflicts of 3b7bac53 to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8233ff863d207d669a32034d49e02036987def95
parents f34c6d9c 3b7bac53

packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
    android:clipChildren="false"

    android:clipToPadding="false"

    android:gravity="center"

    android:paddingStart="16dp"

    android:paddingEnd="16dp"

    android:paddingStart="8dp"

    android:paddingEnd="8dp"

    android:orientation="horizontal">

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ 
    <dimen name="status_bar_header_padding_bottom">48dp</dimen>



    <!-- The height of the container that holds the system icons in the quick settings header. -->

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

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



    <!-- The height of the container that holds the system icons in the quick settings header in the

         car setting. -->