Improve snackbar action accessibility.

1. Add the ability for clients to specify a string to announce when users
cluck on an action in a snackbar view.
2. Add Downloads Home download deletion / undo as the first client.

Skip-Translation-Screenshots-Check: True
Bug: 1090969
Change-Id: I97fb23a471542bbaa141ea0696e7ac3d60269e9c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2431455
Commit-Queue: David Trainor <dtrainor@chromium.org>
Reviewed-by: Pavel Yatsuk <pavely@chromium.org>
Reviewed-by: Shakti Sahu <shaktisahu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816745}

chrome/android/java/src/org/chromium/chrome/browser/download/home/snackbars/DeleteUndoCoordinator.java

@@ -46,6 +46,8 @@ public class DeleteUndoCoordinator {
                 Snackbar.TYPE_ACTION, Snackbar.UMA_DOWNLOAD_DELETE_UNDO);
         snackbar.setAction(ContextUtils.getApplicationContext().getString(R.string.undo), callback);
         snackbar.setTemplateText(UndoUiUtils.getTemplateTextFor(itemsSelected));
+        snackbar.setActionAccessibilityAnnouncement(
+                UndoUiUtils.getAccessibilityActionAnnouncementTextFor(itemsSelected));
         mView.showSnackbar(snackbar);
     }
 

chrome/android/java/src/org/chromium/chrome/browser/download/home/snackbars/UndoUiUtils.java

@@ -30,4 +30,15 @@ final class UndoUiUtils {
                 ? context.getString(R.string.delete_message)
                 : context.getString(R.string.undo_bar_multiple_downloads_delete_message);
     }
+
+    /** @return A {@link String} representing the text to announce when an undo occurs. */
+    public static String getAccessibilityActionAnnouncementTextFor(Collection<OfflineItem> items) {
+        String title = getTitleFor(items);
+        Context context = ContextUtils.getApplicationContext();
+        return items.size() == 1
+                ? context.getString(R.string.undo_bar_delete_restore_accessibility_message, title)
+                : context.getString(
+                        R.string.undo_bar_multiple_downloads_delete_restore_accessibility_message,
+                        title);
+    }
 }
\ No newline at end of file

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

@@ -3363,6 +3363,12 @@ Data from your Incognito session will only be cleared from Chrome when you <ph n
       <message name="IDS_UNDO_BAR_MULTIPLE_DOWNLOADS_DELETE_MESSAGE" desc="Message shown when you can undo deleting several downloads.">
         <ph name="NUMBER_OF_DOWNLOADS">%1$s<ex>3</ex></ph> downloads deleted
       </message>
+      <message name="IDS_UNDO_BAR_DELETE_RESTORE_ACCESSIBILITY_MESSAGE" desc="Message spoken out loud for accessibility when a user decides to undo a download deletion.">
+        Restored <ph name="ITEM_TITLE">%1$s<ex>YouTube</ex></ph>
+      </message>
+      <message name="IDS_UNDO_BAR_MULTIPLE_DOWNLOADS_DELETE_RESTORE_ACCESSIBILITY_MESSAGE" desc="Message spoken out loud for accessibility when a user decides to undo multiple download deletions at once.">
+        <ph name="NUMBER_OF_DOWNLOADS">%1$s<ex>3</ex></ph> downloads restored
+      </message>
 
       <!-- MultiWindow -->
       <message name="IDS_UNSUPPORTED_NUMBER_OF_WINDOWS" desc="Popup message for when the user has tried to start too many concurrent versions of Chrome.">

chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java

@@ -95,6 +95,7 @@ public class Snackbar {
     private String mTemplateText;
     private String mActionText;
     private Object mActionData;
+    private String mAccessibilityActionAnnouncement;
     private int mBackgroundColor;
     private int mTextApperanceResId;
     private boolean mSingleLine = true;
@@ -162,6 +163,16 @@ public class Snackbar {
         return this;
     }
 
+    /**
+     * Sets the text to accessibility announce when the action button is pressed.
+     * @param accessibilityActionAnnouncement An optional string to be announced when the action
+     *        button is pressed.
+     */
+    public Snackbar setActionAccessibilityAnnouncement(String accessibilityActionAnnouncement) {
+        mAccessibilityActionAnnouncement = accessibilityActionAnnouncement;
+        return this;
+    }
+
     /**
      * Sets the identity profile image that will be displayed at the beginning of the snackbar.
      * If null, there won't be a profile image. The ability to have an icon is exclusive to
@@ -241,6 +252,10 @@ public class Snackbar {
         return mActionData;
     }
 
+    String getActionAccessibilityAnnouncement() {
+        return mAccessibilityActionAnnouncement;
+    }
+
     boolean getSingleLine() {
         return mSingleLine;
     }

chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java

@@ -179,6 +179,7 @@ public class SnackbarManager implements OnClickListener, ActivityStateListener,
      */
     @Override
     public void onClick(View v) {
+        mView.announceActionForAccessibility();
         mSnackbars.removeCurrentDueToAction();
         updateView();
     }

chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java

@@ -12,6 +12,7 @@ import android.app.Activity;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
+import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.SurfaceView;
@@ -210,6 +211,15 @@ public class SnackbarView {
                 + mContainerView.getResources().getString(R.string.bottom_bar_screen_position));
     }
 
+    /**
+     * Sends an accessibility event to mContainerView announcing that an action was taken based on
+     * the action button being pressed.  May do nothing if no announcement was specified.
+     */
+    public void announceActionForAccessibility() {
+        if (TextUtils.isEmpty(mSnackbar.getActionAccessibilityAnnouncement())) return;
+        mContainerView.announceForAccessibility(mSnackbar.getActionAccessibilityAnnouncement());
+    }
+
     /**
      * Updates the view to display data from the given snackbar. No-op if the view is already
      * showing the given snackbar.