Revert "Revert of Roll android_tools deps (patchset #4 id:60001 of https://codereview.chromium.org/1419533002/ )"

Relanding CL after fixing lint errors for system_webview_apk

This reverts commit de6b09140fd5cbf679ddbbe37d206848ab15d421.

BUG=537270

Review URL: https://codereview.chromium.org/1403353004

Cr-Commit-Position: refs/heads/master@{#356426}

23 files changed, 31 insertions, 15 deletions

diff --git a/DEPS b/DEPS
index 7330ab3..8f9ac6a 100644
--- a/DEPS
+++ b/DEPS
@@ -424,7 +424,7 @@ deps_os = {
      Var('chromium_git') + '/external/android_protobuf.git' + '@' + '999188d0dc72e97f7fe08bb756958a2cf090f4e7',
 
     'src/third_party/android_tools':
-     Var('chromium_git') + '/android_tools.git' + '@' + '4238a28593b7e6178c95431f91ca8c24e45fa7eb',
+     Var('chromium_git') + '/android_tools.git' + '@' + '54492f99c84cab0826a8e656efeb33a1b1bf5a04',
 
     'src/third_party/apache-mime4j':
      Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a',
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebMessagePortAdapter.java b/android_webview/glue/java/src/com/android/webview/chromium/WebMessagePortAdapter.java
index 6e9d65a..7cf2cb4 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebMessagePortAdapter.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebMessagePortAdapter.java
@@ -4,6 +4,8 @@
 
 package com.android.webview.chromium;
 
+import android.annotation.TargetApi;
+import android.os.Build;
 import android.os.Handler;
 import android.webkit.WebMessage;
 import android.webkit.WebMessagePort;
@@ -14,6 +16,7 @@ import org.chromium.android_webview.AwMessagePort;
  * This class is used to convert a WebMessagePort to a MessagePort in chromium
  * world.
  */
+@TargetApi(Build.VERSION_CODES.M)
 public class WebMessagePortAdapter extends WebMessagePort {
 
     private AwMessagePort mPort;
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java
index 50fc242..866262b 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java
@@ -1376,6 +1376,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
     }
 
     @Override
+    @TargetApi(Build.VERSION_CODES.M)
     public void postMessageToMainFrame(final WebMessage message, final Uri targetOrigin) {
         if (checkNeedsPost()) {
             mRunQueue.addTask(new Runnable() {
@@ -1544,6 +1545,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
         return mAwContents.getAccessibilityNodeProvider();
     }
 
+    @TargetApi(Build.VERSION_CODES.M)
     @Override
     public void onProvideVirtualStructure(final ViewStructure structure) {
         mFactory.startYourEngines(false);
@@ -1574,6 +1576,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
 
     // When creating the Assist structure, the left and top are relative to the parent node, and
     // scroll offsets are not needed.
+    @TargetApi(Build.VERSION_CODES.M)
     private void createAssistStructure(ViewStructure viewNode, AccessibilitySnapshotNode node,
             int parentX, int parentY) {
         viewNode.setClassName(node.className);
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
index 98013c9..d521003 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
@@ -275,6 +275,7 @@ public class WebViewContentsClientAdapter extends AwContentsClient {
         }
     }
 
+    @TargetApi(Build.VERSION_CODES.M)
     private static class WebResourceErrorImpl extends WebResourceError {
         private final AwWebResourceError mError;
 
diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py
index 6be2efb..0b61403 100644
--- a/build/android/pylib/constants/__init__.py
+++ b/build/android/pylib/constants/__init__.py
@@ -156,7 +156,7 @@ DEVICE_PERF_OUTPUT_DIR = (
 SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots')
 
 ANDROID_SDK_VERSION = version_codes.MARSHMALLOW
-ANDROID_SDK_BUILD_TOOLS_VERSION = '23.0.0'
+ANDROID_SDK_BUILD_TOOLS_VERSION = '23.0.1'
 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
                                 'third_party', 'android_tools', 'sdk')
 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
diff --git a/build/common.gypi b/build/common.gypi
index 21fadf6..0c629f5 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1718,7 +1718,7 @@
             'android_host_arch%': '<!(uname -m)',
             # Android API-level of the SDK used for compilation.
             'android_sdk_version%': '23',
-            'android_sdk_build_tools_version%': '23.0.0',
+            'android_sdk_build_tools_version%': '23.0.1',
             'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
 
             'conditions': [
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 7ca1b70..19ed535 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -17,7 +17,7 @@ if (is_android) {
   if (!defined(default_android_sdk_root)) {
     default_android_sdk_root = "//third_party/android_tools/sdk"
     default_android_sdk_version = "23"
-    default_android_sdk_build_tools_version = "23.0.0"
+    default_android_sdk_build_tools_version = "23.0.1"
   }
 
   if (!defined(default_android_keystore_path)) {
diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
index 4e38b93..c777fbd 100644
--- a/build/secondary/third_party/android_tools/BUILD.gn
+++ b/build/secondary/third_party/android_tools/BUILD.gn
@@ -33,6 +33,7 @@ android_resources("android_support_design_resources") {
   resource_dirs = [ "$android_sdk_root/extras/android/support/design/res" ]
   deps = [
     ":android_support_v7_appcompat_resources",
+    ":android_support_v7_recyclerview_resources",
   ]
   custom_package = "android.support.design"
 }
diff --git a/chrome/android/java/res/drawable-hdpi/ic_collapse.png b/chrome/android/java/res/drawable-hdpi/ic_collapsed.png
index 6a08d2a..6a08d2a 100644
--- a/chrome/android/java/res/drawable-hdpi/ic_collapse.png
+++ b/chrome/android/java/res/drawable-hdpi/ic_collapsed.png
diff --git a/chrome/android/java/res/drawable-hdpi/ic_expand.png b/chrome/android/java/res/drawable-hdpi/ic_expanded.png
index d9a7dc4..d9a7dc4 100644
--- a/chrome/android/java/res/drawable-hdpi/ic_expand.png
+++ b/chrome/android/java/res/drawable-hdpi/ic_expanded.png
diff --git a/chrome/android/java/res/drawable-mdpi/ic_collapse.png b/chrome/android/java/res/drawable-mdpi/ic_collapsed.png
index 94c6b77..94c6b77 100644
--- a/chrome/android/java/res/drawable-mdpi/ic_collapse.png
+++ b/chrome/android/java/res/drawable-mdpi/ic_collapsed.png
diff --git a/chrome/android/java/res/drawable-mdpi/ic_expand.png b/chrome/android/java/res/drawable-mdpi/ic_expanded.png
index 386af07..386af07 100644
--- a/chrome/android/java/res/drawable-mdpi/ic_expand.png
+++ b/chrome/android/java/res/drawable-mdpi/ic_expanded.png
diff --git a/chrome/android/java/res/drawable-xhdpi/ic_collapse.png b/chrome/android/java/res/drawable-xhdpi/ic_collapsed.png
index 6e35277..6e35277 100644
--- a/chrome/android/java/res/drawable-xhdpi/ic_collapse.png
+++ b/chrome/android/java/res/drawable-xhdpi/ic_collapsed.png
diff --git a/chrome/android/java/res/drawable-xhdpi/ic_expand.png b/chrome/android/java/res/drawable-xhdpi/ic_expanded.png
index 95c3a27..95c3a27 100644
--- a/chrome/android/java/res/drawable-xhdpi/ic_expand.png
+++ b/chrome/android/java/res/drawable-xhdpi/ic_expanded.png
diff --git a/chrome/android/java/res/drawable-xxhdpi/ic_collapse.png b/chrome/android/java/res/drawable-xxhdpi/ic_collapsed.png
index 78e8ca1..78e8ca1 100644
--- a/chrome/android/java/res/drawable-xxhdpi/ic_collapse.png
+++ b/chrome/android/java/res/drawable-xxhdpi/ic_collapsed.png
diff --git a/chrome/android/java/res/drawable-xxhdpi/ic_expand.png b/chrome/android/java/res/drawable-xxhdpi/ic_expanded.png
index 5844525..5844525 100644
--- a/chrome/android/java/res/drawable-xxhdpi/ic_expand.png
+++ b/chrome/android/java/res/drawable-xxhdpi/ic_expanded.png
diff --git a/chrome/android/java/res/drawable-xxxhdpi/ic_collapse.png b/chrome/android/java/res/drawable-xxxhdpi/ic_collapsed.png
index fb78a61..fb78a61 100644
--- a/chrome/android/java/res/drawable-xxxhdpi/ic_collapse.png
+++ b/chrome/android/java/res/drawable-xxxhdpi/ic_collapsed.png
diff --git a/chrome/android/java/res/drawable-xxxhdpi/ic_expand.png b/chrome/android/java/res/drawable-xxxhdpi/ic_expanded.png
index 483f541..483f541 100644
--- a/chrome/android/java/res/drawable-xxxhdpi/ic_expand.png
+++ b/chrome/android/java/res/drawable-xxxhdpi/ic_expanded.png
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsGroupView.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsGroupView.java
index 9eb2496..9f1f26f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsGroupView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsGroupView.java
@@ -71,9 +71,9 @@ public class RecentTabsGroupView extends RelativeLayout {
         // Create drawable for expand/collapse arrow.
         LevelListDrawable collapseIcon = new LevelListDrawable();
         collapseIcon.addLevel(DRAWABLE_LEVEL_COLLAPSED, DRAWABLE_LEVEL_COLLAPSED,
-                TintedDrawable.constructTintedDrawable(getResources(), R.drawable.ic_expand));
+                TintedDrawable.constructTintedDrawable(getResources(), R.drawable.ic_expanded));
         TintedDrawable collapse =
-                TintedDrawable.constructTintedDrawable(getResources(), R.drawable.ic_collapse);
+                TintedDrawable.constructTintedDrawable(getResources(), R.drawable.ic_collapsed);
         collapse.setTint(
                 ApiCompatibilityUtils.getColorStateList(getResources(), R.color.blue_mode_tint));
         collapseIcon.addLevel(DRAWABLE_LEVEL_EXPANDED, DRAWABLE_LEVEL_EXPANDED, collapse);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
index 8176d72..89b0d17 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
@@ -1216,10 +1216,13 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
                 setUrlToPageUrl();
             }
         }
-
+        int id = getSecurityIconResource(securityLevel, !shouldEmphasizeHttpsScheme());
         // ImageView#setImageResource is no-op if given resource is the current one.
-        mSecurityButton.setImageResource(
-                getSecurityIconResource(securityLevel, !shouldEmphasizeHttpsScheme()));
+        if (id == 0) {
+            mSecurityButton.setImageDrawable(null);
+        } else {
+            mSecurityButton.setImageResource(id);
+        }
 
         if (mSecurityIconType == securityLevel) return;
         mSecurityIconType = securityLevel;
@@ -1289,7 +1292,7 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
                 mNavigationButton.setImageResource(R.drawable.ic_omnibox_magnifier);
                 break;
             case EMPTY:
-                mNavigationButton.setImageResource(0);
+                mNavigationButton.setImageDrawable(null);
                 break;
             default:
                 assert false;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
index a7534c4..021ece7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
@@ -128,7 +128,7 @@ public class PrivacyPreferences extends PreferenceFragment
         searchSuggestionsPref.setOnPreferenceChangeListener(this);
         searchSuggestionsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 
-        if (!ContextualSearchFieldTrial.isEnabled(getContext())) {
+        if (!ContextualSearchFieldTrial.isEnabled(getActivity())) {
             preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
         }
 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
index 32cd4e9..3942175 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
@@ -250,7 +250,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
         // Set the title and arrow icons for the header.
         allowedGroup.setGroupTitle(resourceId, numAllowed);
         TintedDrawable icon = TintedDrawable.constructTintedDrawable(getResources(),
-                mAllowListExpanded ? R.drawable.ic_expand : R.drawable.ic_collapse);
+                mAllowListExpanded ? R.drawable.ic_expanded : R.drawable.ic_collapsed);
         allowedGroup.setExpanded(mAllowListExpanded);
         allowedGroup.setIcon(icon);
     }
@@ -267,7 +267,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
         // Set the title and arrow icons for the header.
         blockedGroup.setGroupTitle(R.string.website_settings_blocked_group_heading, numBlocked);
         TintedDrawable icon = TintedDrawable.constructTintedDrawable(getResources(),
-                mBlockListExpanded ? R.drawable.ic_expand : R.drawable.ic_collapse);
+                mBlockListExpanded ? R.drawable.ic_expanded : R.drawable.ic_collapsed);
         blockedGroup.setExpanded(mBlockListExpanded);
         blockedGroup.setIcon(icon);
     }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
index df87a09..49b02da 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
@@ -367,9 +367,14 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
         if (securityLevel == ConnectionSecurityLevel.NONE) {
             mAnimDelegate.hideSecurityButton();
         } else {
+            int id = LocationBarLayout.getSecurityIconResource(
+                    securityLevel, !shouldEmphasizeHttpsScheme());
             // ImageView#setImageResource is no-op if given resource is the current one.
-            mSecurityButton.setImageResource(LocationBarLayout.getSecurityIconResource(
-                    securityLevel, !shouldEmphasizeHttpsScheme()));
+            if (id == 0) {
+                mSecurityButton.setImageDrawable(null);
+            } else {
+                mSecurityButton.setImageResource(id);
+            }
             mAnimDelegate.showSecurityButton();
         }
         mUrlBar.emphasizeUrl();