[Android][Autofill] Add honorific prefix field to AddressEditor

The new input is placed above the name field and only shown if Address
Editor is opened from Autofill Settings (purpose = AUTOFILL_SETTINGS)
and kAutofillEnableUIForHonorificPrefixesInSettings feature is enabled.

The entered value will not be saved, because honorifics are temporarily
disabled (crbug/1113617).

Screenshot: https://storage.cloud.google.com/chromium-translation-screenshots/4dcf597fed4da10035e80a4f22cf4a73b927a84e

Bug: 1141884
Change-Id: I2ff12dfb6935d576e3ca73c3b3cdaddd75b82b2e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2571759Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Reviewed-by: Christoph Schwering <schwering@google.com>
Commit-Queue: Elizabeth Popova <lizapopova@google.com>
Cr-Commit-Position: refs/heads/master@{#834665}

chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java

@@ -214,6 +214,7 @@ public class PersonalDataManager {
             return mOrigin;
         }
 
+        @CalledByNative("AutofillProfile")
         public String getHonorificPrefix() {
             return mHonorificPrefix;
         }

chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java

@@ -25,6 +25,7 @@ import org.chromium.chrome.browser.autofill.prefeditor.EditorModel;
 import org.chromium.chrome.browser.autofill.settings.AutofillProfileBridge;
 import org.chromium.chrome.browser.autofill.settings.AutofillProfileBridge.AddressField;
 import org.chromium.chrome.browser.autofill.settings.AutofillProfileBridge.AddressUiComponent;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.payments.mojom.AddressErrors;
 
 import java.lang.annotation.Retention;
@@ -63,6 +64,8 @@ public class AddressEditor
     @Nullable
     private EditorFieldModel mCountryField;
     @Nullable
+    private EditorFieldModel mHonorificField;
+    @Nullable
     private EditorFieldModel mPhoneField;
     @Nullable
     private EditorFieldModel mEmailField;
@@ -112,6 +115,11 @@ public class AddressEditor
         mAddressErrors = errors;
     }
 
+    private boolean isUIForHonorificPrefixesEnabled() {
+        return ChromeFeatureList.isEnabled(
+                ChromeFeatureList.AUTOFILL_ENABLE_UI_FOR_HONORIFIC_PREFIXES_IN_SETTINGS);
+    }
+
     private String getAddressError(int field) {
         if (mAddressErrors == null) return null;
 
@@ -152,6 +160,7 @@ public class AddressEditor
      * Builds and shows an editor model with the following fields.
      *
      * [ country dropdown    ] <----- country dropdown is always present.
+     * [ honorific field     ] <----- above name, present if purpose is Purpose.AUTOFILL_SETTINGS.
      * [ an address field    ] \
      * [ an address field    ]  \
      *         ...                <-- field order, presence, required, and labels depend on country.
@@ -226,6 +235,17 @@ public class AddressEditor
         mPhoneValidator.setCountryCode(mCountryField.getValue().toString());
         mPhoneFormatter.setCountryCode(mCountryField.getValue().toString());
 
+        // Honorific prefix is present only for autofill settings.
+        if (mPurpose == Purpose.AUTOFILL_SETTINGS && isUIForHonorificPrefixesEnabled()) {
+            if (mHonorificField == null) {
+                mHonorificField = EditorFieldModel.createTextInput();
+                mHonorificField.setLabel(
+                        mContext.getString(R.string.autofill_profile_editor_honorific_prefix));
+            }
+            // Retrieve and set the honorific prefix value.
+            mHonorificField.setValue(mProfile.getHonorificPrefix());
+        }
+
         // There's a finite number of fields for address editing. Changing the country will re-order
         // and relabel the fields. The meaning of each field remains the same.
         if (mAddressFields.isEmpty()) {
@@ -333,6 +353,9 @@ public class AddressEditor
         profile.setCountryCode(mCountryField.getValue().toString());
         profile.setPhoneNumber(mPhoneField.getValue().toString());
         if (mEmailField != null) profile.setEmailAddress(mEmailField.getValue().toString());
+        if (mHonorificField != null) {
+            profile.setHonorificPrefix(mHonorificField.getValue().toString());
+        }
 
         // Autofill profile bridge normalizes the language code for the autofill profile.
         profile.setLanguageCode(mAutofillProfileBridge.getCurrentBestLanguageCode());
@@ -507,6 +530,11 @@ public class AddressEditor
         for (int i = 0; i < mAddressUiComponents.size(); i++) {
             AddressUiComponent component = mAddressUiComponents.get(i);
 
+            // Honorific prefix should go before name.
+            if (component.id == AddressField.RECIPIENT && mHonorificField != null) {
+                mEditor.addField(mHonorificField);
+            }
+
             EditorFieldModel field = mAddressFields.get(component.id);
 
             // Labels depend on country, e.g., state is called province in some countries. These are

chrome/android/javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragmentTest.java

@@ -15,17 +15,20 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
 
-import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.Criteria;
 import org.chromium.base.test.util.CriteriaHelper;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.autofill.AutofillTestHelper;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.settings.SettingsActivity;
 import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.ui.KeyboardVisibilityDelegate;
 
@@ -36,13 +39,15 @@ import java.util.concurrent.TimeoutException;
  * Unit test suite for AutofillProfilesFragment.
  */
 
-@RunWith(BaseJUnit4ClassRunner.class)
+@RunWith(ChromeJUnit4ClassRunner.class)
 public class AutofillProfilesFragmentTest {
     @Rule
     public final AutofillTestRule rule = new AutofillTestRule();
     @Rule
     public final SettingsActivityTestRule<AutofillProfilesFragment> mSettingsActivityTestRule =
             new SettingsActivityTestRule<>(AutofillProfilesFragment.class);
+    @Rule
+    public final TestRule mFeaturesProcessorRule = new Features.JUnitProcessor();
 
     @Before
     public void setUp() throws TimeoutException {
@@ -66,6 +71,8 @@ public class AutofillProfilesFragmentTest {
     @Test
     @MediumTest
     @Feature({"Preferences"})
+    @Features.
+    EnableFeatures({ChromeFeatureList.AUTOFILL_ENABLE_UI_FOR_HONORIFIC_PREFIXES_IN_SETTINGS})
     public void testAddProfile() throws Exception {
         SettingsActivity activity = mSettingsActivityTestRule.startSettingsActivity();
         AutofillProfilesFragment autofillProfileFragment =
@@ -82,8 +89,8 @@ public class AutofillProfilesFragmentTest {
 
         // Add a profile.
         updatePreferencesAndWait(autofillProfileFragment, addProfile,
-                new String[] {"Alice Doe", "Google", "111 Added St", "Los Angeles", "CA", "90291",
-                        "650-253-0000", "add@profile.com"},
+                new String[] {"Ms.", "Alice Doe", "Google", "111 Added St", "Los Angeles", "CA",
+                        "90291", "650-253-0000", "add@profile.com"},
                 R.id.editor_dialog_done_button, false);
 
         Assert.assertEquals(7 /* One toggle + one add button + five profiles. */,
@@ -98,6 +105,8 @@ public class AutofillProfilesFragmentTest {
     @Test
     @MediumTest
     @Feature({"Preferences"})
+    @Features.
+    EnableFeatures({ChromeFeatureList.AUTOFILL_ENABLE_UI_FOR_HONORIFIC_PREFIXES_IN_SETTINGS})
     public void testAddIncompletedProfile() throws Exception {
         SettingsActivity activity = mSettingsActivityTestRule.startSettingsActivity();
         AutofillProfilesFragment autofillProfileFragment =
@@ -113,7 +122,7 @@ public class AutofillProfilesFragmentTest {
         Assert.assertNotNull(addProfile);
 
         // Add an incomplete profile.
-        updatePreferencesAndWait(autofillProfileFragment, addProfile, new String[] {"Mike Doe"},
+        updatePreferencesAndWait(autofillProfileFragment, addProfile, new String[] {"", "Mike Doe"},
                 R.id.editor_dialog_done_button, false);
 
         // Incomplete profile should still be added.
@@ -128,6 +137,8 @@ public class AutofillProfilesFragmentTest {
     @Test
     @MediumTest
     @Feature({"Preferences"})
+    @Features.
+    EnableFeatures({ChromeFeatureList.AUTOFILL_ENABLE_UI_FOR_HONORIFIC_PREFIXES_IN_SETTINGS})
     public void testAddProfileWithInvalidPhone() throws Exception {
         SettingsActivity activity = mSettingsActivityTestRule.startSettingsActivity();
         AutofillProfilesFragment autofillProfileFragment =
@@ -144,7 +155,8 @@ public class AutofillProfilesFragmentTest {
 
         // Try to add a profile with invalid phone.
         updatePreferencesAndWait(autofillProfileFragment, addProfile,
-                new String[] {"", "", "", "", "", "", "123"}, R.id.editor_dialog_done_button, true);
+                new String[] {"", "", "", "", "", "", "", "123"}, R.id.editor_dialog_done_button,
+                true);
         activity.finish();
     }
 
@@ -183,6 +195,8 @@ public class AutofillProfilesFragmentTest {
     @Test
     @MediumTest
     @Feature({"Preferences"})
+    @Features.
+    EnableFeatures({ChromeFeatureList.AUTOFILL_ENABLE_UI_FOR_HONORIFIC_PREFIXES_IN_SETTINGS})
     public void testEditProfile() throws Exception {
         SettingsActivity activity = mSettingsActivityTestRule.startSettingsActivity();
         AutofillProfilesFragment autofillProfileFragment =
@@ -199,8 +213,8 @@ public class AutofillProfilesFragmentTest {
 
         // Edit a profile.
         updatePreferencesAndWait(autofillProfileFragment, johnProfile,
-                new String[] {"Emily Doe", "Google", "111 Edited St", "Los Angeles", "CA", "90291",
-                        "650-253-0000", "edit@profile.com"},
+                new String[] {"Dr.", "Emily Doe", "Google", "111 Edited St", "Los Angeles", "CA",
+                        "90291", "650-253-0000", "edit@profile.com"},
                 R.id.editor_dialog_done_button, false);
         // Check if the preferences are updated correctly.
         Assert.assertEquals(6 /* One toggle + one add button + four profiles. */,

chrome/browser/autofill/android/personal_data_manager_android.cc

@@ -323,6 +323,8 @@ void PersonalDataManagerAndroid::PopulateNativeProfileFromJava(
       AutofillType(NAME_FULL),
       ConvertJavaStringToUTF16(Java_AutofillProfile_getFullName(env, jprofile)),
       g_browser_process->GetApplicationLocale());
+  MaybeSetRawInfo(profile, autofill::NAME_HONORIFIC_PREFIX,
+                  Java_AutofillProfile_getHonorificPrefix(env, jprofile));
   MaybeSetRawInfo(profile, autofill::COMPANY_NAME,
                   Java_AutofillProfile_getCompanyName(env, jprofile));
   MaybeSetRawInfo(profile, autofill::ADDRESS_HOME_STREET_ADDRESS,

chrome/browser/flags/android/chrome_feature_list.cc

@@ -77,6 +77,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
     &autofill::features::kAutofillRefreshStyleAndroid,
     &autofill::features::kAutofillEnableCardNicknameManagement,
     &autofill::features::kAutofillEnableGoogleIssuedCard,
+    &autofill::features::kAutofillEnableUIForHonorificPrefixesInSettings,
     &autofill_assistant::features::kAutofillAssistant,
     &autofill_assistant::features::kAutofillAssistantChromeEntry,
     &autofill_assistant::features::kAutofillAssistantDirectActions,

chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

@@ -205,6 +205,8 @@ public abstract class ChromeFeatureList {
             "AutofillEnablePasswordInfoBarAccountIndicationFooter";
     public static final String AUTOFILL_ENABLE_SAVE_CARD_INFO_BAR_ACCOUNT_INDICATION_FOOTER =
             "AutofillEnableSaveCardInfoBarAccountIndicationFooter";
+    public static final String AUTOFILL_ENABLE_UI_FOR_HONORIFIC_PREFIXES_IN_SETTINGS =
+            "AutofillEnableUIForHonorificPrefixesInSettings";
     public static final String ADJUST_WEBAPK_INSTALLATION_SPACE = "AdjustWebApkInstallationSpace";
     public static final String ANDROID_DEFAULT_BROWSER_PROMO = "AndroidDefaultBrowserPromo";
     public static final String ANDROID_LAYOUT_CHANGE_TAB_REPARENT =

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

@@ -464,6 +464,9 @@ CHAR-LIMIT guidelines:
      <message name="IDS_AUTOFILL_PROFILE_EDITOR_COUNTRY" desc="Label for a spinner input field containing a list of countries or regions [CHAR-LIMIT=32]">
         Country/Region
       </message>
+      <message name="IDS_AUTOFILL_PROFILE_EDITOR_HONORIFIC_PREFIX" desc="Label for text input field containing a title that can be auto-filled by Chrome. [CHAR-LIMIT=32]" meaning="A 'Title' field in a web form could be a prefix like Ms., Mx., or Dr. or a position held, like Captain or Rabbi.">
+        Title
+      </message>
       <message name="IDS_AUTOFILL_PROFILE_EDITOR_EMAIL_ADDRESS" desc="Label for text input field containing an e-mail address. [CHAR-LIMIT=32]">
         Email
       </message>

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

+4dcf597fed4da10035e80a4f22cf4a73b927a84e
\ No newline at end of file