update strings to the latest from the doc

Change-Id: I8e36ce73e96b5d5e21d5b656bf258e8056f2c155

Author: Aaron Mandle

auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackPasswordPrompt.java

@@ -54,10 +54,9 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.welcome_back_password_prompt_layout);
         mPasswordLayout = (TextInputLayout) findViewById(R.id.password_layout);
         mEmail = getIntent().getStringExtra(ControllerConstants.EXTRA_EMAIL);
-        String appName = getIntent().getStringExtra(ControllerConstants.EXTRA_APP_NAME);
         TextView bodyTextView = (TextView) findViewById(R.id.welcome_back_password_body);
         String bodyText = getResources().getString(R.string.welcome_back_password_prompt_body);
-        bodyText = String.format(bodyText, mEmail, appName);
+        bodyText = String.format(bodyText, mEmail);
         SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(bodyText);
         int emailStart = bodyText.indexOf(mEmail);
         spannableStringBuilder.setSpan(bold, emailStart, emailStart + mEmail.length(), Spannable

auth/src/main/java/com/firebase/ui/auth/ui/email/field_validators/BaseValidator.java

@@ -19,6 +19,7 @@
 public class BaseValidator {
     protected TextInputLayout mErrorContainer;
     protected String mErrorMessage = "";
+    protected String mEmptyMessage = null;
 
     public BaseValidator(TextInputLayout errorContainer) {
         mErrorContainer = errorContainer;
@@ -29,7 +30,10 @@ protected boolean isValid(CharSequence charSequence) {
     }
 
     public boolean validate(CharSequence charSequence) {
-        if (isValid(charSequence)) {
+        if (mEmptyMessage != null && (charSequence == null || charSequence.length() == 0)) {
+            mErrorContainer.setError(mEmptyMessage);
+            return false;
+        } else if (isValid(charSequence)) {
             mErrorContainer.setError("");
             return true;
         } else {

auth/src/main/java/com/firebase/ui/auth/ui/email/field_validators/EmailFieldValidator.java

@@ -23,8 +23,9 @@ public class EmailFieldValidator extends BaseValidator {
 
     public EmailFieldValidator(TextInputLayout errorContainer) {
         super(errorContainer);
-        mErrorMessage = mErrorContainer.getContext().getResources().getString(R.string
-                .invalid_email_address);
+        mErrorMessage = mErrorContainer.getContext().getResources().getString(
+                R.string.invalid_email_address);
+        mEmptyMessage = mErrorContainer.getResources().getString(R.string.missing_email_address);
     }
 
     @Override

auth/src/main/res/layout/welcome_back_password_prompt_layout.xml

@@ -58,7 +58,7 @@
             />
         <Button
             style="@style/FirebaseUI.Button"
-            android:text="@string/button_text_next"
+            android:text="@string/button_text_sign_in"
             android:id="@+id/button_done"/>
     </LinearLayout>
 </LinearLayout>

auth/src/main/res/values/strings.xml

@@ -13,16 +13,18 @@
         reset your password.</string>
     <string name="create_account_title">Create account</string>
     <string name="required_field">You can\'t leave this empty.</string>
-    <string name="password_length">Short passwords are easy to guess. Try one with at least
-    %1$d characters.</string>
-    <string name="invalid_email_address">Please enter a valid email address.</string>
+    <string name="password_length">Strong passwords have at least %1$d characters and a mix of letters
+        and numbers</string>
+    <string name="invalid_email_address">That email address isn\'t correct</string>
+    <string name="missing_email_address">Enter your email address to continue</string>
     <string name="button_text_next">Next</string>
     <string name="button_text_send">Send</string>
     <string name="button_text_save">Save</string>
+    <string name="button_text_sign_in">Sign in</string>
     <string name="require_email_text">Please input email address</string>
     <string name="confirm_recovery_body">Follow the instructions sent to %1$s to recover your
         password.</string>
-    <string name="recovery_fail_body">Sorry, we are unable to find your email. Please start the flow again with another email.</string>
+    <string name="recovery_fail_body">That email address doesn\'t match an existing account</string>
     <string name="account_welcomeback">Welcome back</string>
     <string name="finding_credential">Finding a credential…</string>
     <string name="do_delete">Delete</string>
@@ -38,17 +40,13 @@
     <string name="recover_password_title">Recover password</string>
     <string name="welcome_back_idp_header">You already have an account</string>
     <string name="welcome_back_idp_prompt">
-        Good news! You\'ve already used
-        <xliff:g id="email_addr" example="[email protected]">%1$s</xliff:g>.
-        Sign in with <xliff:g id="provider_name" example="Google">%2$s</xliff:g>
-        to continue to <xliff:g id="app_name" example="SuperApp">%3$s</xliff:g>.
+        You've already used <xliff:g id="email_addr" example="[email protected]">%1$s</xliff:g>.
+        Sign in with <xliff:g id="provider_name" example="Google">%2$s</xliff:g> to continue.
     </string>
     <string name="welcome_back_idp_button">Sign in</string>
-    <string name="welcome_back_password_prompt_body">You\'ve previously used this email address:
-        <xliff:g id="email_addr" example="[email protected]">%1$s</xliff:g> for
-        <xliff:g id="app_name" example="SuperApp">%2$s</xliff:g>, but signed in with a password.
-        Enter your <xliff:g id="app_name" example="SuperApp">%2$s</xliff:g> password to remember
-        this account.</string>
+    <string name="welcome_back_password_prompt_body">You\'ve already used
+        <xliff:g id="email_addr" example="[email protected]">%1$s</xliff:g> to sign in. Enter
+        your password for that account.</string>
     <string name="password_word">Password</string>
     <string name="idp_name_google">Google</string>
     <string name="idp_name_facebook">Facebook</string>

auth/src/main/res/values/values.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="min_password_length">8</integer>
+    <integer name="min_password_length">6</integer>
     <item name="visible_icon" type="dimen" format="float">1.0</item>
     <item name="slightly_visible_icon" type="dimen" format="float">0.4</item>
 </resources>