[Android][WebSignIn][UI] Add strings for web sign-in auth error

This CL adds subtitle and button strings for web sign-in auth error.

Screenshot: https://crbug.com/1116952#c3
Bug: 1116952
Change-Id: I251f3c6f24e98e3198828d8f25ae5eafd8c684dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2368557Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Tanmoy Mollik <triploblastic@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801286}

chrome/android/java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetView.java

@@ -152,11 +152,12 @@ class AccountPickerBottomSheetView implements BottomSheetContent {
      */
     void setUpSignInGeneralErrorView() {
         mAccountPickerTitle.setText(R.string.signin_account_picker_bottom_sheet_error_title);
+        mAccountPickerSubtitle.setText(R.string.signin_account_picker_general_error_subtitle);
         mAccountPickerSubtitle.setVisibility(View.VISIBLE);
         mContentView.findViewById(R.id.account_picker_signin_spinner_view)
                 .setVisibility(View.INVISIBLE);
-        mContinueAsButton.setVisibility(View.VISIBLE);
         mContinueAsButton.setText(R.string.signin_account_picker_general_error_button);
+        mContinueAsButton.setVisibility(View.VISIBLE);
 
         mContentView.findViewById(R.id.account_picker_horizontal_divider).setVisibility(View.GONE);
         mSelectedAccountView.setVisibility(View.GONE);
@@ -164,13 +165,14 @@ class AccountPickerBottomSheetView implements BottomSheetContent {
 
     /**
      * Sets up the view for sign-in auth error.
-     * TODO(https://crbug.com/1116952): Add strings for subtitle and button for sign-in auth error
      */
     void setUpSignInAuthErrorView() {
         mAccountPickerTitle.setText(R.string.signin_account_picker_bottom_sheet_error_title);
+        mAccountPickerSubtitle.setText(R.string.signin_account_picker_auth_error_subtitle);
         mAccountPickerSubtitle.setVisibility(View.VISIBLE);
         mContentView.findViewById(R.id.account_picker_signin_spinner_view)
                 .setVisibility(View.INVISIBLE);
+        mContinueAsButton.setText(R.string.auth_error_card_button);
         mContinueAsButton.setVisibility(View.VISIBLE);
 
         mContentView.findViewById(R.id.account_picker_horizontal_divider).setVisibility(View.GONE);

chrome/android/javatests/src/org/chromium/chrome/browser/signin/AccountPickerBottomSheetTest.java

@@ -334,6 +334,9 @@ public class AccountPickerBottomSheetTest {
         });
         onView(withText(R.string.signin_account_picker_bottom_sheet_error_title))
                 .check(matches(isDisplayed()));
+        onView(withText(R.string.signin_account_picker_auth_error_subtitle))
+                .check(matches(isDisplayed()));
+        onView(withText(R.string.auth_error_card_button)).check(matches(isDisplayed()));
         onView(withId(R.id.account_picker_horizontal_divider)).check(matches(not(isDisplayed())));
         onView(withId(R.id.account_picker_selected_account)).check(matches(not(isDisplayed())));
         onView(withId(R.id.account_picker_signin_spinner_view)).check(matches(not(isDisplayed())));

chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -2446,6 +2446,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_SIGNIN_ACCOUNT_PICKER_GENERAL_ERROR_SUBTITLE" desc="The subtitle of the account picker bottom sheet when something went wrong in the sign-in process">
         Chrome couldn’t verify your information
       </message>
+      <message name="IDS_SIGNIN_ACCOUNT_PICKER_AUTH_ERROR_SUBTITLE" desc="The subtitle of the account picker bottom sheet when there is an authentication error with the credentials of the account selected.">
+        Sorry, we couldn’t validate your credentials
+      </message>
       <message name="IDS_SIGNIN_ACCOUNT_PICKER_GENERAL_ERROR_BUTTON" desc="Button text of the account picker bottom sheet when something went wrong in the sign-in process. User can try again if they click it.">
         Try again
       </message>

chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_SIGNIN_ACCOUNT_PICKER_AUTH_ERROR_SUBTITLE.png.sha1

+0891305cb2dc15b6b5962c0ab5ba7b2de43c7470
\ No newline at end of file