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

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

Merge "Swipe integration"

parents 61d03348 fb8bdbb7

packages/SystemUI/src/com/android/systemui/statusbar/AmbientPulseManager.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import com.android.systemui.statusbar.notification.row.NotificationInflater.Infl 
 * dozing and/or in AOD.  The pulse uses the notification's ambient view and pops in briefly

 * before automatically dismissing the alert.

 */

public final class AmbientPulseManager extends AlertingNotificationManager {

public class AmbientPulseManager extends AlertingNotificationManager {



    protected final ArraySet<OnAmbientChangedListener> mListeners = new ArraySet<>();

    @VisibleForTesting

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

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.systemui.statusbar.notification.stack; 


import static com.android.systemui.statusbar.notification.ActivityLaunchAnimator

        .ExpandAnimationParameters;

import static com.android.systemui.statusbar.notification.stack.StackStateAnimator

        .ANIMATION_DURATION_SWIPE;

import static com.android.systemui.statusbar.phone.NotificationIconAreaController.LOW_PRIORITY;



import android.animation.Animator;
@@ -5093,7 +5095,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
            if (i == 0) {

                endRunnable = animationFinishAction;

            }

            dismissViewAnimated(view, endRunnable, totalDelay, 260);

            dismissViewAnimated(view, endRunnable, totalDelay, ANIMATION_DURATION_SWIPE);

            currentDelay = Math.max(50, currentDelay - rowDelayDecrement);

            totalDelay += currentDelay;

        }

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

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ public class StackStateAnimator { 
    public static final int ANIMATION_DURATION_WAKEUP = 500;

    public static final int ANIMATION_DURATION_GO_TO_FULL_SHADE = 448;

    public static final int ANIMATION_DURATION_APPEAR_DISAPPEAR = 464;

    public static final int ANIMATION_DURATION_SWIPE = 260;

    public static final int ANIMATION_DURATION_DIMMED_ACTIVATED = 220;

    public static final int ANIMATION_DURATION_CLOSE_REMOTE_INPUT = 150;

    public static final int ANIMATION_DURATION_HEADS_UP_APPEAR = 550;