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

Commit 7e80df81 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I2d517a2b,Ia59e2d97,Id98763d8,Ie3f57dd4,Ib5ddee5c, ... 

* changes:
  Fixed a bug where messages could be invisible
  Implemented rounded clipping for groups
  Added padding between notifications and qs on lockscreen
  Insetting notifications on the lock screen
  Increased the notification paddings
  Implemented animations for rounding
  Refactored PropertyAnimator for easier usability
  Implemented rounded corners for notifications
parents f86d3754 1b38ecae

core/res/res/layout/notification_material_action_list.xml

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 
            android:id="@+id/actions"

            android:layout_width="match_parent"

            android:layout_height="@dimen/notification_action_list_height"

            android:paddingEnd="4dp"

            android:paddingEnd="12dp"

            android:paddingStart="8dp"

            android:orientation="horizontal"

            android:gravity="center_vertical"

            android:visibility="gone"

core/res/res/values/dimens.xml

+9 −9
Original line number Diff line number Diff line
@@ -152,11 +152,11 @@ 
    <dimen name="dialog_padding">16dp</dimen>



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

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

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



    <!-- The margin on the end of the content view

        Keep in sync with notification_content_plus_picture_margin! -->

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

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



    <!-- The margin on the end of the content view with a picture.

        Keep in sync with notification_content_plus_picture_margin! -->
@@ -166,7 +166,7 @@ 
        content end margin.

        Keep equal to (notification_content_picture_margin + notification_content_margin_end)!

    -->

    <dimen name="notification_content_plus_picture_margin_end">72dp</dimen>

    <dimen name="notification_content_plus_picture_margin_end">80dp</dimen>



    <!-- The additional margin on the sides of the ambient view. -->

    <dimen name="notification_extra_margin_ambient">16dp</dimen>
@@ -175,10 +175,10 @@ 
    <dimen name="notification_action_list_height">56dp</dimen>



    <!-- height of the content margin to accomodate for the header -->

    <dimen name="notification_content_margin_top">37.5dp</dimen>

    <dimen name="notification_content_margin_top">41.5dp</dimen>



    <!-- height of the content margin on the bottom -->

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

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



    <!-- The height of the progress bar. -->

    <dimen name="notification_progress_bar_height">15dp</dimen>
@@ -187,16 +187,16 @@ 
    <dimen name="notification_progress_margin_top">8dp</dimen>



    <!-- height of the notification header (for icon and package name) -->

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

    <dimen name="notification_header_height">54dp</dimen>



    <!-- The height of the background for a notification header on a group -->

    <dimen name="notification_header_background_height">45.5dp</dimen>

    <dimen name="notification_header_background_height">49.5dp</dimen>



    <!-- The top padding for the notification header -->

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

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



    <!-- The bottom padding for the notification header -->

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

    <dimen name="notification_header_padding_bottom">13dp</dimen>



    <!-- The margin at the bottom of the notification header. -->

    <dimen name="notification_header_margin_bottom">5dp</dimen>

core/res/res/values/styles_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -1304,7 +1304,7 @@ please see styles_device_defaults.xml. 
        <item name="paddingBottom">@dimen/notification_header_padding_bottom</item>

        <item name="layout_marginBottom">@dimen/notification_header_margin_bottom</item>

        <item name="paddingStart">@dimen/notification_content_margin_start</item>

        <item name="paddingEnd">16dp</item>

        <item name="paddingEnd">@dimen/notification_content_margin_end</item>

        <item name="gravity">top</item>

    </style>

packages/SystemUI/res/layout/notification_info.xml

+1 −1
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ 
        android:layout_height="48dp"

        android:orientation="horizontal"

        android:gravity="end"

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

        android:layout_marginBottom="8dp" >

        <TextView

            android:id="@+id/more_settings"
@@ -139,7 +140,6 @@ 
            android:text="@string/notification_done"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_marginEnd="8dp"

            style="@style/TextAppearance.NotificationInfo.Button"/>

    </LinearLayout>

</com.android.systemui.statusbar.NotificationInfo>

packages/SystemUI/res/layout/notification_snooze.xml

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
            android:layout_height="wrap_content"

            android:layout_alignParentStart="true"

            android:layout_centerVertical="true"

            android:paddingStart="16dp"

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

            android:textColor="#DD000000"

            android:paddingEnd="4dp"/>
@@ -53,7 +53,7 @@ 
            style="@style/TextAppearance.NotificationInfo.Button"

            android:layout_width="wrap_content"

            android:layout_height="36dp"

            android:layout_marginEnd="8dp"

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

            android:layout_alignParentEnd="true"

            android:layout_centerVertical="true"

            android:text="@string/snooze_undo" />