Revert "Bouncer: Add title for each auth screen."

This reverts commit 22941ed02d.

Reason for revert: title is shown when viewcontroller onPause is called. We might want to set the title in a more specific place

Change-Id: I9a1618aa1961f5a2a37de92cb5ecc87bebcbbdeb
This commit is contained in:
Aaron Liu
2022-03-10 03:23:22 +00:00
parent 22941ed02d
commit 7657fa90b5
5 changed files with 9 additions and 4 deletions

View File

@@ -183,7 +183,7 @@ public class KeyguardPasswordViewController
@Override
void resetState() {
mPasswordEntry.setTextOperationUser(UserHandle.of(KeyguardUpdateMonitor.getCurrentUser()));
mMessageAreaController.setMessage(R.string.keyguard_enter_your_password);
mMessageAreaController.setMessage("");
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(R.string.keyguard_enter_your_pattern);
mMessageAreaController.setMessage("");
}
private void handleAttemptLockout(long elapsedRealtimeDeadline) {

View File

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

View File

@@ -75,6 +75,12 @@ 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(R.string.keyguard_enter_your_pattern)
verify(mKeyguardMessageAreaController).setMessage("")
}
}