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

Commit 3d7ccaf8 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

AOD clock and notification animation 

Better transitions for pulsing notifications and other keyguard
messages.

Fixes: 77601057
Fixes: 67641732
Test: visual
Test: atest packages/SystemUI/tests/src/com/android/keyguard/KeyguardSliceViewTest.java
Test: atest packages/SystemUI/tests/src/com/android/systemui/util/wakelock/KeepAwakeAnimationListenerTest.java
Merged-In: I3e3ec844834bf7f5d9ab341f308e78a002248a87
Change-Id: I1e6d95c62dc7463e8084a64f04c6dee3173967a6
parent 594d6e9e

core/res/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -207,6 +207,9 @@ 
    <!-- The bottom padding for the notification header -->

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



    <!-- The margin at the top of the notification header when dozing. -->

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



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

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

core/res/res/values/styles_material.xml

+1 −0
Original line number Diff line number Diff line
@@ -1309,6 +1309,7 @@ please see styles_device_defaults.xml. 
    </style>



    <style name="Notification.Header.Ambient">

        <item name="layout_marginTop">@dimen/notification_header_margin_top_ambient</item>

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

    </style>

packages/SystemUI/res-keyguard/layout/keyguard_presentation.xml

+1 −2
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ 
                style="@style/widget_big_thin"

                android:format12Hour="@string/keyguard_widget_12_hours_format"

                android:format24Hour="@string/keyguard_widget_24_hours_format"

                android:baselineAligned="true"

                android:layout_marginBottom="@dimen/bottom_text_spacing_digital" />

                android:baselineAligned="true" />



            <include layout="@layout/keyguard_status_area" />

            <ImageView

packages/SystemUI/res-keyguard/layout/keyguard_status_area.xml

+4 −2
Original line number Diff line number Diff line
@@ -28,12 +28,14 @@ 
    android:clipToPadding="false"

    android:orientation="vertical"

    android:layout_centerHorizontal="true">

    <TextView android:id="@+id/title"

    <com.android.systemui.statusbar.AlphaOptimizedTextView

              android:id="@+id/title"

              android:layout_width="match_parent"

              android:layout_height="wrap_content"

              android:layout_marginBottom="7dp"

              android:layout_marginBottom="@dimen/widget_title_bottom_margin"

              android:paddingStart="64dp"

              android:paddingEnd="64dp"

              android:visibility="gone"

              android:textColor="?attr/wallpaperTextColor"

              android:theme="@style/TextAppearance.Keyguard"

    />

packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml

+1 −5
Original line number Diff line number Diff line
@@ -67,21 +67,17 @@ 
                android:singleLine="true"

                style="@style/widget_big_thin"

                android:format12Hour="@string/keyguard_widget_12_hours_format"

                android:format24Hour="@string/keyguard_widget_24_hours_format"

                android:layout_marginBottom="@dimen/bottom_text_spacing_digital" />

                android:format24Hour="@string/keyguard_widget_24_hours_format" />

            <View

                android:id="@+id/clock_separator"

                android:layout_width="@dimen/widget_separator_width"

                android:layout_height="@dimen/widget_separator_thickness"

                android:layout_marginTop="22dp"

                android:layout_below="@id/clock_view"

                android:background="#f00"

                android:backgroundTint="?attr/wallpaperTextColor"

                android:layout_centerHorizontal="true" />



            <include layout="@layout/keyguard_status_area"

                android:id="@+id/keyguard_status_area"

                android:layout_marginTop="20dp"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_below="@id/clock_separator" />