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

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

@@ -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);

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

@@ -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) {

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

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

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

@@ -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(

packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewControllerTest.kt

@@ -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("")
     }
 }