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

Commit 67563f5c authored by Selim Cinek's avatar Selim Cinek
Browse files

Transitioning media on lockscreen with a fade 

UX wise a fade was much preferred, so we built in the capability
for media transitions to fade from location to location.
We're now also fading the media when transitioning
between QS and Lockscreen.

This also polishes the animation further.

Bug: 184946919
Test: atest SystemUITests
Change-Id: Id9fc58469bebe69ad7a0189e4c4acd36523cdeed
parent 48f51861

packages/SystemUI/res/layout/media_carousel.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    android:layout_height="wrap_content"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:forceHasOverlappingRendering="false"

    android:theme="@style/MediaPlayer">

    <com.android.systemui.media.MediaScrollView

        android:id="@+id/media_carousel_scroller"

packages/SystemUI/res/values/dimens.xml

+7 −8
Original line number Diff line number Diff line
@@ -1409,10 +1409,6 @@ 
    <dimen name="media_output_dialog_icon_corner_radius">16dp</dimen>

    <dimen name="media_output_dialog_title_anim_y_delta">12.5dp</dimen>



    <!-- Delay after which the media will start transitioning to the full shade on

         the lockscreen -->

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



    <!-- Distance that the full shade transition takes in order for qs to fully transition to the

         shade -->

    <dimen name="lockscreen_shade_qs_transition_distance">200dp</dimen>
@@ -1421,13 +1417,16 @@ 
         the shade (in alpha) -->

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



    <!-- Extra inset for the notifications when accounting for media during the lockscreen to

         shade transition to compensate for the disappearing media -->

    <dimen name="lockscreen_shade_transition_extra_media_inset">-48dp</dimen>

    <!-- Distance that the full shade transition takes in order for media to fully transition to

         the shade -->

    <dimen name="lockscreen_shade_media_transition_distance">140dp</dimen>



    <!-- Maximum overshoot for the topPadding of notifications when transitioning to the full

         shade -->

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

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



    <!-- Maximum overshoot for the pulse expansion -->

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



    <dimen name="people_space_widget_radius">28dp</dimen>

    <dimen name="people_space_image_radius">20dp</dimen>

packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt

+284 −43

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/qs/QSFragment.java

+8 −8

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -5147,8 +5147,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    }



    /**

     * Sets the extra top inset for the full shade transition. This is needed to compensate for

     * media transitioning to quick settings

     * Sets the extra top inset for the full shade transition. This moves notifications down

     * during the drag down.

     */

    public void setExtraTopInsetForFullShadeTransition(float inset) {

        mExtraTopInsetForFullShadeTransition = inset;