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

Commit 515b2035 authored by Selim Cinek's avatar Selim Cinek
Browse files

Insetting notifications on the lock screen 

We are now insetting the notifications on the
lockscreen.
This also improves the clipping to the notifications
since we can't just clip the whole content to the
outline bounds.

Test: add notifications on lockscreen, observe inset. Try swiping too.
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationCustomViewWrapperTest.java
Bug: 69168591
Change-Id: Ie3f57dd4938bc97124fb98230cc9427fd4973ead
parent 9b49f6de

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"

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" />

packages/SystemUI/res/values/dimens.xml

+4 −1
Original line number Diff line number Diff line
@@ -101,8 +101,11 @@ 
    <!-- Height of a heads up notification in the status bar -->

    <dimen name="notification_max_heads_up_height_increased">188dp</dimen>



    <!-- Side padding on the lockscreen on the side of notifications -->

    <dimen name="notification_lockscreen_side_paddings">8dp</dimen>



    <!-- Additional side padding for custom content if the app doesn't target P yet -->

    <dimen name="notification_content_custom_view_side_padding">8dp</dimen>

    <dimen name="notification_content_custom_view_side_padding">@dimen/notification_lockscreen_side_paddings</dimen>



    <!-- Height of a messaging notifications with actions at least. Not that this is an upper bound

         and the notification won't use this much, but is measured with wrap_content -->

packages/SystemUI/res/values/ids.xml

+4 −0
Original line number Diff line number Diff line
@@ -85,6 +85,10 @@ 
    <item type="id" name="top_roundess_animator_start_tag"/>

    <item type="id" name="top_roundess_animator_end_tag"/>



    <item type="id" name="side_padding_animator_tag"/>

    <item type="id" name="side_padding_animator_start_tag"/>

    <item type="id" name="side_padding_animator_end_tag"/>



    <!-- Accessibility actions for the notification menu -->

    <item type="id" name="action_snooze_undo"/>

    <item type="id" name="action_snooze_shorter"/>