Clean up tinted ImageView subclasses

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.appmenu;
 
 import android.content.Context;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 import android.graphics.PorterDuff;
@@ skipping 160 matching lines @@
             // * file:// - After API 24, file: URIs are not supported in VIEW intents and thus
             //             can not be added to the homescreen.
             // * content:// - Accessing external content URIs requires the calling app to grant
             //                access to the resource via FLAG_GRANT_READ_URI_PERMISSION, and that
             //                is not persisted when adding to the homescreen.
             // * If creating shortcuts it not supported by the current home screen.
             boolean canShowHomeScreenMenuItem = ShortcutHelper.isAddToHomeIntentSupported()
                     && !isChromeScheme && !isFileScheme && !isContentScheme && !isIncognito;
             prepareAddToHomescreenMenuItem(menu, currentTab, canShowHomeScreenMenuItem);
 
-            // Hide request desktop site on all chrome:// pages except for the NTP. Check request
-            // desktop site if it's activated on this page.
-            MenuItem requestItem = menu.findItem(R.id.request_desktop_site_id);
-            updateRequestDesktopSiteMenuItem(requestItem, currentTab);
+            updateRequestDesktopSiteMenuItem(menu, currentTab);
 
             // Only display reader mode settings menu option if the current page is in reader mode.
             menu.findItem(R.id.reader_mode_prefs_id)
                     .setVisible(DomDistillerUrlUtils.isDistilledPage(currentTab.getUrl()));
 
             // Only display the Enter VR button if VR Shell Dev environment is enabled.
             menu.findItem(R.id.enter_vr_id).setVisible(
                     CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_VR_SHELL_DEV));
 
             if (FeatureUtilities.isChromeHomeEnabled()) {
@@ skipping 165 matching lines @@
             bookmarkMenuItem.setChecked(true);
             bookmarkMenuItem.setTitleCondensed(mActivity.getString(R.string.edit_bookmark));
         } else {
             bookmarkMenuItem.setIcon(R.drawable.btn_star);
             bookmarkMenuItem.setChecked(false);
             bookmarkMenuItem.setTitleCondensed(null);
         }
     }
 
     /**
-     * Updates the request desktop site item's visibility
+     * Updates the request desktop site item's state.
      *
      * @param requstMenuItem {@link MenuItem} for request desktop site.
      * @param currentTab      Current tab being displayed.
      */
-    protected void updateRequestDesktopSiteMenuItem(
-            MenuItem requstMenuItem, Tab currentTab) {
+    protected void updateRequestDesktopSiteMenuItem(Menu menu, Tab currentTab) {
+        MenuItem requestMenuRow = menu.findItem(R.id.request_desktop_site_row_menu_id);
+        MenuItem requestMenuLabel = menu.findItem(R.id.request_desktop_site_id);
+        MenuItem requestMenuCheck = menu.findItem(R.id.request_desktop_site_check_id);
+
+        // Hide request desktop site on all chrome:// pages except for the NTP.
         String url = currentTab.getUrl();
         boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
                 || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
-        requstMenuItem.setVisible(!isChromeScheme || currentTab.isNativePage());
-        requstMenuItem.setChecked(currentTab.getUseDesktopUserAgent());
-        requstMenuItem.setTitleCondensed(requstMenuItem.isChecked()
-                ? mActivity.getString(R.string.menu_request_desktop_site_on)
-                : mActivity.getString(R.string.menu_request_desktop_site_off));
+        requestMenuRow.setVisible(!isChromeScheme || currentTab.isNativePage());
+
+        // Mark the checkbox if RDS is activated on this page.
+        requestMenuCheck.setChecked(currentTab.getUseDesktopUserAgent());
+
+        // 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()
+                        ? mActivity.getString(R.string.menu_request_desktop_site_on)
+                        : mActivity.getString(R.string.menu_request_desktop_site_off));
     }
 }