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

Commit 34ce1895 authored by Lucas Silva's avatar Lucas Silva Committed by Automerger Merge Worker
Browse files

Merge "Disable notification shade close animation when occluded." into... 

Merge "Disable notification shade close animation when occluded." into tm-qpr-dev am: a6bbdc72 am: a4f3ea32

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



Change-Id: Iba7acb7a0f3107c2d74a8305ed045eb5922530f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f141e1d8 a4f3ea32

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

+1 −1
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    public void reset(boolean hideBouncerWhenShowing) {

        if (mShowing) {

            // Hide quick settings.

            mNotificationPanelViewController.resetViews(/* animate= */ true);

            mNotificationPanelViewController.resetViews(/* animate= */ !mOccluded);

            // Hide bouncer and quick-quick settings.

            if (mOccluded && !mDozing) {

                mCentralSurfaces.hideKeyguard();