Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bouncer: Add title for each auth screen." into tm-dev am: ed72c410a9

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

Change-Id: I49f2687794e424de102efeff2a3673e234820bff
This commit is contained in:
Aaron Liu
2022-03-05 01:44:21 +00:00
committed by Automerger Merge Worker
parent 614799e677 ed72c410a9
commit b4591df95e
5 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/keyguard/KeyguardPasswordViewController.java
View File

@@ -183,7 +183,7 @@ public class KeyguardPasswordViewController
@Override @Override
void resetState() { void resetState() {
mPasswordEntry.setTextOperationUser(UserHandle.of(KeyguardUpdateMonitor.getCurrentUser())); mPasswordEntry.setTextOperationUser(UserHandle.of(KeyguardUpdateMonitor.getCurrentUser()));
mMessageAreaController.setMessage(""); mMessageAreaController.setMessage(R.string.keyguard_enter_your_password);
final boolean wasDisabled = mPasswordEntry.isEnabled(); final boolean wasDisabled = mPasswordEntry.isEnabled();
mView.setPasswordEntryEnabled(true); mView.setPasswordEntryEnabled(true);
mView.setPasswordEntryInputEnabled(true); mView.setPasswordEntryInputEnabled(true);

2
packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java
View File

@@ -358,7 +358,7 @@ public class KeyguardPatternViewController
} }
private void displayDefaultSecurityMessage() { private void displayDefaultSecurityMessage() {
mMessageAreaController.setMessage(""); mMessageAreaController.setMessage(R.string.keyguard_enter_your_pattern);
} }
private void handleAttemptLockout(long elapsedRealtimeDeadline) { private void handleAttemptLockout(long elapsedRealtimeDeadline) {

1
packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputViewController.java
View File

@@ -132,5 +132,6 @@ public abstract class KeyguardPinBasedInputViewController<T extends KeyguardPinB
@Override @Override
void resetState() { void resetState() {
mView.setPasswordEntryEnabled(true); mView.setPasswordEntryEnabled(true);
mMessageAreaController.setMessage(R.string.keyguard_enter_your_pin);
} }
} }

6
packages/SystemUI/src/com/android/keyguard/KeyguardPinViewController.java
View File

@@ -75,12 +75,6 @@ public class KeyguardPinViewController
mView.reloadColors(); mView.reloadColors();
} }
@Override
void resetState() {
super.resetState();
mMessageAreaController.setMessage("");
}
@Override @Override
public boolean startDisappearAnimation(Runnable finishRunnable) { public boolean startDisappearAnimation(Runnable finishRunnable) {
return mView.startDisappearAnimation( return mView.startDisappearAnimation(

2
packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewControllerTest.kt
View File

@@ -88,6 +88,6 @@ class KeyguardPatternViewControllerTest : SysuiTestCase() {
fun onPause_clearsTextField() { fun onPause_clearsTextField() {
mKeyguardPatternViewController.init() mKeyguardPatternViewController.init()
mKeyguardPatternViewController.onPause() mKeyguardPatternViewController.onPause()
verify(mKeyguardMessageAreaController).setMessage("") verify(mKeyguardMessageAreaController).setMessage(R.string.keyguard_enter_your_pattern)
} }
} }