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

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

Merge "Adding comment explaining "else" branch in onStateChange" into tm-qpr-dev am: 2c130a95 

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



Change-Id: I815c05a713315349f27873ecac95b393685e46bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f731f8a2 2c130a95

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+5 −0
Original line number Diff line number Diff line
@@ -4678,6 +4678,11 @@ public final class NotificationPanelViewController extends PanelViewController { 
                    }

                }

            } else {

                // this else branch means we are doing one of:

                //  - from KEYGUARD and SHADE (but not expanded shade)

                //  - from SHADE to KEYGUARD

                //  - from SHADE_LOCKED to SHADE

                //  - getting notified again about the current SHADE or KEYGUARD state

                final boolean animatingUnlockedShadeToKeyguard = oldState == SHADE

                        && statusBarState == KEYGUARD

                        && mScreenOffAnimationController.isKeyguardShowDelayed();