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

Commit 752f5a6e authored by Alex Stetson's avatar Alex Stetson Committed by Automerger Merge Worker
Browse files

Merge "Clear and re-focus pin password entry field" into udc-dev am: e044f614 am: 22140b9d 

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



Change-Id: I1abb26d9d82e3b2f0c9d26651d9052ccaf96096d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 802ba466 22140b9d

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

+5 −0
Original line number Diff line number Diff line
@@ -127,6 +127,11 @@ public abstract class KeyguardPinBasedInputViewController<T extends KeyguardPinB 
    @Override

    public void onResume(int reason) {

        super.onResume(reason);

        // It's possible to reach a state here where mPasswordEntry believes it is focused

        // but it is not actually focused. This state will prevent the view from gaining focus,

        // as requestFocus will no-op since the focus flag is already set. By clearing focus first,

        // it's guaranteed that the view has focus.

        mPasswordEntry.clearFocus();

        mPasswordEntry.requestFocus();

    }