[Mfill][Android] Highlight 'Chrome' in filling IPH

Instead of just telling users what a chip fills, highlight that a chip
is an *autofill suggestion* provided by *Chrome*.

IDS_IPH_KEYBOARD_ACCESSORY_FILL_WITH_CHROME screenshot:
https://storage.cloud.google.com/chromium-translation-screenshots/1b93b6afc656909bacdf8f62712a21b5990c7ac4

Bug: 1124711
Change-Id: Iefb80ccd3f59a865da661cf51d1308095c58fcb6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2418312Reviewed-by: Ioana Pandele <ioanap@chromium.org>
Commit-Queue: Friedrich [CET] <fhorschig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808348}

chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryIPHUtils.java

@@ -12,7 +12,7 @@ import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.keyboard_accessory.R;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
-import org.chromium.components.browser_ui.widget.textbubble.ImageTextBubble;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
@@ -69,9 +69,8 @@ class KeyboardAccessoryIPHUtils {
         if (!tracker.shouldTriggerHelpUI(feature)) return; // This call records the IPH intent.
         @StringRes
         int helpText = getHelpTextForFeature(feature);
-        ImageTextBubble helpBubble = new ImageTextBubble(view.getContext(), rootView, helpText,
-                helpText, true, new ViewRectProvider(view), R.drawable.ic_chrome,
-                ChromeAccessibilityUtil.get().isAccessibilityEnabled());
+        TextBubble helpBubble = new TextBubble(view.getContext(), rootView, helpText, helpText,
+                new ViewRectProvider(view), ChromeAccessibilityUtil.get().isAccessibilityEnabled());
         helpBubble.setDismissOnTouchInteraction(true);
         helpBubble.show();
         // To emphasize which chip is pointed to, set selected to true for the built-in highlight.
@@ -91,11 +90,9 @@ class KeyboardAccessoryIPHUtils {
     private static @StringRes int getHelpTextForFeature(@FeatureConstants String feature) {
         switch (feature) {
             case FeatureConstants.KEYBOARD_ACCESSORY_ADDRESS_FILL_FEATURE:
-                return R.string.iph_keyboard_accessory_fill_address;
             case FeatureConstants.KEYBOARD_ACCESSORY_PASSWORD_FILLING_FEATURE:
-                return R.string.iph_keyboard_accessory_fill_password;
             case FeatureConstants.KEYBOARD_ACCESSORY_PAYMENT_FILLING_FEATURE:
-                return R.string.iph_keyboard_accessory_fill_payment;
+                return R.string.iph_keyboard_accessory_fill_with_chrome;
         }
         assert false : "Unknown help text for feature: " + feature;
         return 0;

chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd

@@ -195,14 +195,8 @@
       <message name="IDS_KEYBOARD_ACCESSORY_SHEET_HIDE" desc="Description for the active icon button that closes an accessory sheet and brings back the keyboard.">
           Show keyboard
       </message>
-      <message name="IDS_IPH_KEYBOARD_ACCESSORY_FILL_ADDRESS" desc="Text in In-Product-Help bubble suggesting to fill a physical address with Chrome.">
-          Fill address
-      </message>
-      <message name="IDS_IPH_KEYBOARD_ACCESSORY_FILL_PASSWORD" desc="Text in In-Product-Help bubble suggesting to fill a password with Chrome.">
-          Fill password
-      </message>
-      <message name="IDS_IPH_KEYBOARD_ACCESSORY_FILL_PAYMENT" desc="Text in In-Product-Help bubble suggesting to fill a credit card with Chrome.">
-          Fill payment method
+      <message name="IDS_IPH_KEYBOARD_ACCESSORY_FILL_WITH_CHROME" desc="Text in In-Product-Help bubble suggesting to use an autofill suggestion provided by Chrome.">
+          Use Chrome autofill suggestion
       </message>
       <message name="IDS_PASSWORD_GENERATION_ACCESSORY_BUTTON" desc="Text for the button used to generate a password.">
           Suggest strong password

chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings_grd/IDS_IPH_KEYBOARD_ACCESSORY_FILL_ADDRESS.png.sha1

-415cb951b4882a3d26048284f875747f2836b4c8
\ No newline at end of file

chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings_grd/IDS_IPH_KEYBOARD_ACCESSORY_FILL_PASSWORD.png.sha1

-10e4465d1a9ae7342337b6042611348482ffceaf
\ No newline at end of file

chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings_grd/IDS_IPH_KEYBOARD_ACCESSORY_FILL_PAYMENT.png.sha1

-c7398a54e31c16465587c316a41f47c3b457fe57
\ No newline at end of file

chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings_grd/IDS_IPH_KEYBOARD_ACCESSORY_FILL_WITH_CHROME.png.sha1

+1b93b6afc656909bacdf8f62712a21b5990c7ac4
\ No newline at end of file

chrome/android/features/keyboard_accessory/javatests/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryModernViewTest.java

@@ -262,7 +262,7 @@ public class KeyboardAccessoryModernViewTest {
         });
 
         onViewWaiting(withText("Johnathan"));
-        waitForHelpBubble(withText(R.string.iph_keyboard_accessory_fill_password));
+        waitForHelpBubble(withText(R.string.iph_keyboard_accessory_fill_with_chrome));
         onView(withChild(withText("Johnathan"))).check(matches(isSelected()));
         onView(withText("Johnathan")).perform(click());
 
@@ -290,7 +290,7 @@ public class KeyboardAccessoryModernViewTest {
         });
 
         onViewWaiting(withText("Johnathan"));
-        waitForHelpBubble(withText(R.string.iph_keyboard_accessory_fill_address));
+        waitForHelpBubble(withText(R.string.iph_keyboard_accessory_fill_with_chrome));
         onView(withText("Johnathan")).perform(click());
 
         assertThat(tracker.wasDismissed(), is(true));
@@ -316,7 +316,7 @@ public class KeyboardAccessoryModernViewTest {
         });
 
         onViewWaiting(withText("Johnathan"));
-        waitForHelpBubble(withText(R.string.iph_keyboard_accessory_fill_payment));
+        waitForHelpBubble(withText(R.string.iph_keyboard_accessory_fill_with_chrome));
         onView(withText("Johnathan")).perform(click());
 
         assertThat(tracker.wasDismissed(), is(true));