Fix the accessibility string for the RDS menu option.

BUG=874457

Change-Id: I51adca20f4f73ec2e41fab2d9c9f3b736d473b99
Reviewed-on: https://chromium-review.googlesource.com/1179125Reviewed-by: Becky Zhou <huayinz@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584259}

chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuAdapter.java

@@ -244,6 +244,11 @@ class AppMenuAdapter extends BaseAdapter {
                 holder.title.setEnabled(titleItem.isEnabled());
                 holder.title.setFocusable(titleItem.isEnabled());
                 holder.title.setOnClickListener(v -> mAppMenu.onItemClick(titleItem));
+                if (TextUtils.isEmpty(titleItem.getTitleCondensed())) {
+                    holder.title.setContentDescription(null);
+                } else {
+                    holder.title.setContentDescription(titleItem.getTitleCondensed());
+                }
 
                 if (subItem.isCheckable()) {
                     // Display a checkbox for the MenuItem.

chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java

@@ -424,12 +424,13 @@ public class AppMenuPropertiesDelegate {
         requestMenuRow.setVisible(itemVisible);
         if (!itemVisible) return;
 
+        boolean isRds = currentTab.getUseDesktopUserAgent();
         // Mark the checkbox if RDS is activated on this page.
-        requestMenuCheck.setChecked(currentTab.getUseDesktopUserAgent());
+        requestMenuCheck.setChecked(isRds);
 
         // This title doesn't seem to be displayed by Android, but it is used to set up
         // accessibility text in {@link AppMenuAdapter#setupMenuButton}.
-        requestMenuLabel.setTitleCondensed(requestMenuLabel.isChecked()
+        requestMenuLabel.setTitleCondensed(isRds
                         ? mActivity.getString(R.string.menu_request_desktop_site_on)
                         : mActivity.getString(R.string.menu_request_desktop_site_off));
     }