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

Commit 7ddf76be authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Transitioning media on lockscreen with a fade" into sc-dev

parents f7e815dd 67563f5c
Loading
Loading
Loading
Loading
+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"
+7 −8
Original line number Diff line number Diff line
@@ -1418,10 +1418,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>
@@ -1430,13 +1426,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>
+284 −43

File changed.

Preview size limit exceeded, changes collapsed.

+8 −8

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2
Original line number Diff line number Diff line
@@ -5145,8 +5145,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;
Loading