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

Commit 7df2c87f authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Bouncer animation and message" into pi-dev 

am: be72f3d5

Change-Id: Ib2244c7f448e7dafe0f6f87958e8677949de808f
parents e310042d be72f3d5

packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -265,11 +265,11 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout 
            mPendingLockCheck.cancel(false);

            mPendingLockCheck.cancel(false);

            mPendingLockCheck = null;

            mPendingLockCheck = null;

        }

        }

        reset();

    }

    }





    @Override

    @Override

    public void onResume(int reason) {

    public void onResume(int reason) {

        reset();

    }

    }





    @Override

    @Override

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -1184,6 +1184,10 @@ public class KeyguardViewMediator extends SystemUI { 
        Trace.endSection();

        Trace.endSection();

    }

    }





    public boolean isHiding() {

        return mHiding;

    }



    /**

    /**

     * Handles SET_OCCLUDED message sent by setOccluded()

     * Handles SET_OCCLUDED message sent by setOccluded()

     */

     */

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -3942,7 +3942,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
    }

    }





    private void showBouncerIfKeyguard() {

    private void showBouncerIfKeyguard() {

        if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) {

        if ((mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED)

                && !mKeyguardViewMediator.isHiding()) {

            showBouncer(true /* animated */);

            showBouncer(true /* animated */);

        }

        }

    }

    }