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

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

Merge "Show `swipe up to open` message on faceAuth from AOD2" into sc-qpr1-dev am: 0efdcfc8 

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

Change-Id: I7e307a191a8bd446f5db0bbcbf9fa6a418ef558d
parents c44415d5 0efdcfc8

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

+4 −2
Original line number Diff line number Diff line
@@ -800,7 +800,9 @@ public class KeyguardIndicationController { 
     * Show message on the keyguard for how the user can unlock/enter their device.

     */

    public void showActionToUnlock() {

        if (mDozing) {

        if (mDozing

                && !mKeyguardUpdateMonitor.getUserCanSkipBouncer(

                        KeyguardUpdateMonitor.getCurrentUser())) {

            return;

        }
@@ -811,7 +813,7 @@ public class KeyguardIndicationController { 
                String message = mContext.getString(R.string.keyguard_retry);

                mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState);

            }

        } else if (mKeyguardUpdateMonitor.isScreenOn()) {

        } else {

            showTransientIndication(mContext.getString(R.string.keyguard_unlock),

                    false /* isError */, true /* hideOnScreenOff */);

        }