Bouncer: Add title for each auth screen.

On reset state in the view controller, set the security message to be
the default text. It seems like this copy already exists.

Bug: b/218833792
Test: Manual test on multiple devices
Change-Id: I5d704255622864a8593ce1b31747a36ec95224bb
This commit is contained in:
Aaron Liu
2022-03-03 21:31:09 +00:00
parent c6c97b7b84
commit 22941ed02d
5 changed files with 4 additions and 9 deletions

View File

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

View File

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

View File

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

View File

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

View File

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