[Home] Update pull-to-refresh IPH text

Update the in-product help text shown after pull-to-refresh. Also,
always show the pull-to-refresh IPH above the pull handle (rather than
the expand button when accessibility is enabled).

BUG=787030

Change-Id: I4eb9a717ff43b6521733fd16cf22200cf3f06518
Reviewed-on: https://chromium-review.googlesource.com/794635Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#519925}

chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java

@@ -1845,7 +1845,8 @@ public class BottomSheet
         if (!fromMenu && !showRefreshIph && !showColdStartIph) return;
 
         // Determine which strings to use.
-        boolean showExpandButtonHelpBubble = mDefaultToolbarView.isUsingExpandButton();
+        boolean showExpandButtonHelpBubble =
+                !showRefreshIph && mDefaultToolbarView.isUsingExpandButton();
         View anchorView = showExpandButtonHelpBubble
                 ? mControlContainer.findViewById(R.id.expand_sheet_button)
                 : mControlContainer;
@@ -1853,6 +1854,9 @@ public class BottomSheet
                                       : showExpandButtonHelpBubble
                         ? R.string.bottom_sheet_accessibility_expand_button_help_bubble_message
                         : R.string.bottom_sheet_help_bubble_message;
+        int accessibilityStringId = showRefreshIph
+                ? R.string.bottom_sheet_pull_to_refresh_help_bubble_accessibility_message
+                : stringId;
 
         // Register an overview mode observer so the bubble can be dismissed if overview mode
         // is shown.
@@ -1869,7 +1873,8 @@ public class BottomSheet
                 mFullscreenManager.getBrowserVisibilityDelegate().showControlsPersistent();
 
         // Create the help bubble and setup dismissal behavior.
-        mHelpBubble = new ViewAnchoredTextBubble(getContext(), anchorView, stringId, stringId);
+        mHelpBubble = new ViewAnchoredTextBubble(
+                getContext(), anchorView, stringId, accessibilityStringId);
 
         if (ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_HOME_PERSISTENT_IPH)) {
             int dismissTimeout = ChromeFeatureList.getFieldTrialParamByFeatureAsInt(

chrome/android/java/strings/android_chrome_strings.grd

@@ -3163,8 +3163,11 @@ You must have Bluetooth and Location turned on in order to use the Physical Web.
       <message name="IDS_BOTTOM_SHEET_HELP_BUBBLE_MESSAGE" desc="Text displayed in a help bubble above the bottom navigation sheet prompting users to pull the sheet up to see their bookmarks and other content.">
         Pull up to see bookmarks and more
       </message>
-      <message name="IDS_BOTTOM_SHEET_PULL_TO_REFRESH_HELP_BUBBLE_MESSAGE" desc="Text displayed in a help bubble above the toolbar after the user performs a pull-to-refresh action." translateable="false">
-        The address bar is now easy to reach at the bottom of your screen
+      <message name="IDS_BOTTOM_SHEET_PULL_TO_REFRESH_HELP_BUBBLE_MESSAGE" desc="Text displayed in a help bubble above the address bar. “access” is a verb (imperative). The intent of the string is to help users find the address bar at the bottom of the screen.">
+        Access the address bar here
+      </message>
+      <message name="IDS_BOTTOM_SHEET_PULL_TO_REFRESH_HELP_BUBBLE_ACCESSIBILITY_MESSAGE" desc="Text displayed in a help bubble above the address bar when TalkBack is enabled. “access” is a verb (imperative). The intent of the string is to help users find the address bar at the bottom of the screen.">
+        Access the address bar at the bottom of your screen
       </message>
       <message name="IDS_BOTTOM_SHEET_ACCESSIBILITY_EXPAND_BUTTON_HELP_BUBBLE_MESSAGE" desc="Text displayed in a help bubble above the toolbar expand button prompting users to tap the button to see their bookmarks and other content when accessibility is enabled.">
         Tap to see downloads, bookmarks, and history