[Android] Fix accessibility issues for update menu.

The CL for updating the visuals of how a deprecated operating system
should be displayed did not correctly pass along enough information to
be able to always have an up to date content description, which is
important for accessibility.

The state of whether an update badge should be visible or not is always
known at the time it has to be updated, so the state should be passed
in. The reason is that whether the badge is really visible or not might
be correct in all cases when the check happens.

This CL therefore goes back to how things were before the visual update
by passing the state in.

In addition, the menu item itself did not always have a correct
content description, but now it is forcefully set during decoriation
of the item.

Bug: 899695
Change-Id: I9f7e2d4cc6b60ccfaf95d7c07fc351c5c9e2a8ac
Reviewed-on: https://chromium-review.googlesource.com/c/1306399
Commit-Queue: Tommy Nyquist <nyquist@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604022}

chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java

@@ -150,6 +150,8 @@ public class UpdateMenuItemHelper {
         switch (getUpdateType()) {
             case UpdateType.UPDATE_AVAILABLE:
                 title.setText(context.getString(R.string.menu_update));
+                // See crbug.com/899695 for why this line is necessary.
+                title.setContentDescription(context.getString(R.string.menu_update));
                 title.setTextColor(Color.RED);
 
                 String customSummary = getStringParamValue(CUSTOM_SUMMARY);
@@ -164,6 +166,8 @@ public class UpdateMenuItemHelper {
                 break;
             case UpdateType.UNSUPPORTED_OS_VERSION:
                 title.setText(R.string.menu_update_unsupported);
+                // See crbug.com/899695 for why this line is necessary.
+                title.setContentDescription(context.getString(R.string.menu_update_unsupported));
                 title.setTextColor(ApiCompatibilityUtils.getColor(
                         context.getResources(), R.color.default_text_color));
 

chrome/android/java/src/org/chromium/chrome/browser/toolbar/MenuButton.java

@@ -70,6 +70,7 @@ class MenuButton extends FrameLayout {
             case UpdateMenuItemHelper.UpdateType.UNSUPPORTED_OS_VERSION:
                 mUpdateBadgeView.setVisibility(visible ? View.VISIBLE : View.GONE);
                 updateImageResources();
+                updateContentDescription(visible);
                 break;
             case UpdateMenuItemHelper.UpdateType.NONE:
             // Intentional fall through.
@@ -77,6 +78,7 @@ class MenuButton extends FrameLayout {
             // Intentional fall through.
             default:
                 mUpdateBadgeView.setVisibility(View.GONE);
+                updateContentDescription(false);
                 break;
         }
     }
@@ -110,8 +112,12 @@ class MenuButton extends FrameLayout {
         return mUpdateBadgeView.getVisibility() == View.VISIBLE;
     }
 
-    void updateContentDescription() {
-        if (isShowingAppMenuUpdateBadge()) {
+    /**
+     * Sets the content description for the menu button.
+     * @param isUpdateBadgeVisible Whether the update menu badge is visible.
+     */
+    void updateContentDescription(boolean isUpdateBadgeVisible) {
+        if (isUpdateBadgeVisible) {
             switch (UpdateMenuItemHelper.getInstance().getUpdateType()) {
                 case UpdateMenuItemHelper.UpdateType.UPDATE_AVAILABLE:
                     setContentDescription(getResources().getString(

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java

@@ -826,7 +826,7 @@ public abstract class ToolbarLayout extends FrameLayout implements Toolbar {
         if (mMenuBadge == null) return;
         boolean wasShowingMenuBadge = mShowMenuBadge;
         mShowMenuBadge = false;
-        setMenuButtonContentDescription();
+        setMenuButtonContentDescription(false);
 
         if (!animate || !wasShowingMenuBadge) {
             mMenuButtonWrapper.setUpdateBadgeVisibilityIfValidState(false);
@@ -890,7 +890,7 @@ public abstract class ToolbarLayout extends FrameLayout implements Toolbar {
      */
     protected void setAppMenuUpdateBadgeToVisible(boolean animate) {
         if (mMenuBadge == null || mMenuButton == null || mMenuButtonWrapper == null) return;
-        setMenuButtonContentDescription();
+        setMenuButtonContentDescription(true);
         if (!animate || mIsMenuBadgeAnimationRunning) {
             mMenuButtonWrapper.setUpdateBadgeVisibilityIfValidState(true);
             return;
@@ -964,10 +964,11 @@ public abstract class ToolbarLayout extends FrameLayout implements Toolbar {
 
     /**
      * Sets the content description for the menu button.
+     * @param isUpdateBadgeVisible Whether the update menu badge is visible
      */
-    protected void setMenuButtonContentDescription() {
+    protected void setMenuButtonContentDescription(boolean isUpdateBadgeVisible) {
         if (mMenuButtonWrapper == null) return;
-        mMenuButtonWrapper.updateContentDescription();
+        mMenuButtonWrapper.updateContentDescription(isUpdateBadgeVisible);
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

@@ -1830,7 +1830,7 @@ public class ToolbarPhone extends ToolbarLayout
             view.setVisibility(browsingViewsVisibility);
         }
         if (mShowMenuBadge) {
-            setMenuButtonContentDescription();
+            setMenuButtonContentDescription(mTabSwitcherState == STATIC_TAB);
         }
 
         updateProgressBarVisibility();

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java

@@ -517,7 +517,7 @@ public class ToolbarTablet
             mLocationBar.getContainerView().setVisibility(View.INVISIBLE);
             if (mShowMenuBadge) {
                 getMenuBadge().setVisibility(View.GONE);
-                setMenuButtonContentDescription();
+                setMenuButtonContentDescription(false);
             }
         } else {
             mIsInTabSwitcherMode = false;