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

Commit 0a427ef5 authored Jul 13, 2018 by Aarthi Balachander

Show the user switcher only when the bouncer cancel button is pressed.

Bug: 110534280
Test: Tested on device
Change-Id: Iff465ebf5089e023a27e1ec192a580c20b35d242
(cherry picked from commit e2a6edceb007847cc8026b47c365a68610a074f7)

parent 9c512f1c

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -242,6 +242,11 @@ public class KeyguardHostView extends FrameLayout implements SecurityCallback {
		mViewMediatorCallback.resetKeyguard();
		}

		@Override
		public void onCancelClicked() {
		mViewMediatorCallback.onCancelClicked();
		}

		public void resetSecurityContainer() {
		mSecurityContainer.reset();
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,7 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
		if (cancelBtn != null) {
		cancelBtn.setOnClickListener(view -> {
		mCallback.reset();
		mCallback.onCancelClicked();
		});
		}
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -201,6 +201,7 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView
		if (cancelBtn != null) {
		cancelBtn.setOnClickListener(view -> {
		mCallback.reset();
		mCallback.onCancelClicked();
		});
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -163,6 +163,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit
		if (cancelBtn != null) {
		cancelBtn.setOnClickListener(view -> {
		mCallback.reset();
		mCallback.onCancelClicked();
		});
		}
		}

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -48,4 +48,11 @@ public interface KeyguardSecurityCallback {
		* Resets the keyguard view.
		*/
		void reset();

		/**
		* Call when cancel button is pressed in bouncer.
		*/
		default void onCancelClicked() {
		// No-op
		}
		}