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

Commit 9c556fe6 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Switch to SystemUI dimen for notification margins. 

In an upcoming review, I'll be updating notification_content_margin_start
to 56dp (while leaving _end at 16dp).  This is for an intended asymmetry
in the new notification design, but was causing unintended asymmetry in
Quick Settings and notification guts.

Test: atest SystemUITests
Test: manual inspection
Change-Id: Ic2c4f4ffe0aa9f2e4caee8e6e85bf65435b9d969
parent 508ac4b8

core/res/res/values/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -207,9 +207,6 @@ 
    <!-- Default padding for dialogs. -->

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



    <!-- The horizontal margin of the content in the notification shade -->

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



    <!-- The margin on the start of the content view -->

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

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -2864,7 +2864,6 @@ 
  <java-symbol type="drawable" name="ic_collapse_bundle" />

  <java-symbol type="dimen" name="notification_min_content_height" />

  <java-symbol type="dimen" name="notification_header_shrink_min_width" />

  <java-symbol type="dimen" name="notification_shade_content_margin_horizontal" />

  <java-symbol type="dimen" name="notification_content_margin_start" />

  <java-symbol type="dimen" name="notification_content_margin_end" />

  <java-symbol type="dimen" name="notification_reply_inset" />

packages/SystemUI/res/layout/notification_info.xml

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

    android:clipToPadding="true"

    android:orientation="vertical"

    android:paddingStart="@*android:dimen/notification_content_margin_start">

    android:paddingStart="@dimen/notification_shade_content_margin_horizontal">



    <!-- Package Info -->

    <LinearLayout
@@ -120,7 +120,7 @@ asked for it --> 
        android:id="@+id/inline_controls"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingEnd="@*android:dimen/notification_content_margin_end"

        android:paddingEnd="@dimen/notification_shade_content_margin_horizontal"

        android:layout_marginTop="@dimen/notification_guts_option_vertical_padding"

        android:clipChildren="false"

        android:clipToPadding="false"

packages/SystemUI/res/layout/partial_conversation_info.xml

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

    android:clipToPadding="true"

    android:orientation="vertical"

    android:paddingStart="@*android:dimen/notification_content_margin_start">

    android:paddingStart="@dimen/notification_shade_content_margin_horizontal">



    <!-- Package Info -->

    <LinearLayout
@@ -93,7 +93,7 @@ 
        android:id="@+id/inline_controls"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingEnd="@*android:dimen/notification_content_margin_end"

        android:paddingEnd="@dimen/notification_shade_content_margin_horizontal"

        android:layout_marginTop="@dimen/notification_guts_option_vertical_padding"

        android:clipChildren="false"

        android:clipToPadding="false"

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -623,6 +623,9 @@ 
        @dimen/notification_divider_height

    </dimen>



    <!-- The horizontal margin of the content in the notification shade -->

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



    <!-- The top margin for the notification children container in its non-expanded form. -->

    <dimen name="notification_children_container_margin_top">

        @*android:dimen/notification_content_margin_top