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

Commit ff00bfd0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adjust interpolator for shade unlock to match mocks." into tm-dev am: 876ce105 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185713



Change-Id: I94a0b8f94510312e7275e89dea44e02008965b5d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bde21c1b 876ce105

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static androidx.constraintlayout.widget.ConstraintSet.PARENT_ID; 
import static com.android.internal.jank.InteractionJankMonitor.CUJ_NOTIFICATION_SHADE_QS_EXPAND_COLLAPSE;

import static com.android.keyguard.KeyguardClockSwitch.LARGE;

import static com.android.keyguard.KeyguardClockSwitch.SMALL;

import static com.android.systemui.animation.Interpolators.EMPHASIZED_ACCELERATE;

import static com.android.systemui.animation.Interpolators.EMPHASIZED_DECELERATE;

import static com.android.systemui.classifier.Classifier.QS_COLLAPSE;

import static com.android.systemui.classifier.Classifier.QUICK_SETTINGS;
@@ -936,7 +937,7 @@ public class NotificationPanelViewController extends PanelViewController { 
                                        // the launcher icons animation starts, so use that as our

                                        // duration.

                                        .setDuration(unlockAnimationStartDelay)

                                        .setInterpolator(EMPHASIZED_DECELERATE)

                                        .setInterpolator(EMPHASIZED_ACCELERATE)

                                        .withEndAction(() -> {

                                            instantCollapse();

                                            mView.setAlpha(1f);