diff options
author | dcaiafa <dcaiafa@chromium.org> | 2015-10-27 12:07:24 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-27 19:09:35 +0000 |
commit | de6b09140fd5cbf679ddbbe37d206848ab15d421 (patch) | |
tree | f2c9494220da88396b283fc0e5e801fb8b5d2518 | |
parent | f38efa9db8bf4698cf4e0e68c2c4225efcb3081e (diff) | |
download | chromium_src-de6b09140fd5cbf679ddbbe37d206848ab15d421.zip chromium_src-de6b09140fd5cbf679ddbbe37d206848ab15d421.tar.gz chromium_src-de6b09140fd5cbf679ddbbe37d206848ab15d421.tar.bz2 |
Revert of Roll android_tools deps (patchset #4 id:60001 of https://codereview.chromium.org/1419533002/ )
Reason for revert:
Potential cause of break:
http://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus%206%29/builds/3804
Original issue's description:
> Roll android_tools deps
>
> Sets the build-tools version.
> Renames two resources due to resource name clashes with mediarouter
> resources
> Adds recyclerview as a dependency to design in gn.
>
> BUG=537270
>
> Committed: https://crrev.com/8356eb404a31149079621a7fe95e79bea4c9fb3e
> Cr-Commit-Position: refs/heads/master@{#356346}
TBR=dfalcantara@chromium.org,aurimas@chromium.org,jbudorick@chromium.org,yusufo@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=537270
Review URL: https://codereview.chromium.org/1411783009
Cr-Commit-Position: refs/heads/master@{#356360}
-rw-r--r-- | DEPS | 2 | ||||
-rw-r--r-- | build/android/pylib/constants/__init__.py | 2 | ||||
-rw-r--r-- | build/common.gypi | 2 | ||||
-rw-r--r-- | build/config/android/config.gni | 2 | ||||
-rw-r--r-- | build/secondary/third_party/android_tools/BUILD.gn | 1 | ||||
-rw-r--r-- | chrome/android/java/res/drawable-hdpi/ic_collapse.png (renamed from chrome/android/java/res/drawable-hdpi/ic_collapsed.png) | bin | 218 -> 218 bytes | |||
-rw-r--r-- | chrome/android/java/res/drawable-hdpi/ic_expand.png (renamed from chrome/android/java/res/drawable-hdpi/ic_expanded.png) | bin | 219 -> 219 bytes | |||
-rw-r--r-- | chrome/android/java/res/drawable-mdpi/ic_collapse.png (renamed from chrome/android/java/res/drawable-mdpi/ic_collapsed.png) | bin | 130 -> 130 bytes | |||
-rw-r--r-- | chrome/android/java/res/drawable-mdpi/ic_expand.png (renamed from chrome/android/java/res/drawable-mdpi/ic_expanded.png) | bin | 128 -> 128 bytes | |||
-rw-r--r-- | chrome/android/java/res/drawable-xhdpi/ic_collapse.png (renamed from chrome/android/java/res/drawable-xhdpi/ic_collapsed.png) | bin | 176 -> 176 bytes | |||
-rw-r--r-- | chrome/android/java/res/drawable-xhdpi/ic_expand.png (renamed from chrome/android/java/res/drawable-xhdpi/ic_expanded.png) | bin | 179 -> 179 bytes | |||
-rw-r--r-- | chrome/android/java/res/drawable-xxhdpi/ic_collapse.png (renamed from chrome/android/java/res/drawable-xxhdpi/ic_collapsed.png) | bin | 204 -> 204 bytes | |||
-rw-r--r-- | chrome/android/java/res/drawable-xxhdpi/ic_expand.png (renamed from chrome/android/java/res/drawable-xxhdpi/ic_expanded.png) | bin | 206 -> 206 bytes | |||
-rw-r--r-- | chrome/android/java/res/drawable-xxxhdpi/ic_collapse.png (renamed from chrome/android/java/res/drawable-xxxhdpi/ic_collapsed.png) | bin | 263 -> 263 bytes | |||
-rw-r--r-- | chrome/android/java/res/drawable-xxxhdpi/ic_expand.png (renamed from chrome/android/java/res/drawable-xxxhdpi/ic_expanded.png) | bin | 255 -> 255 bytes | |||
-rw-r--r-- | chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsGroupView.java | 4 | ||||
-rw-r--r-- | chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java | 11 | ||||
-rw-r--r-- | chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java | 2 | ||||
-rw-r--r-- | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java | 4 | ||||
-rw-r--r-- | chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java | 9 |
20 files changed, 15 insertions, 24 deletions
@@ -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' + '@' + '54492f99c84cab0826a8e656efeb33a1b1bf5a04', + Var('chromium_git') + '/android_tools.git' + '@' + '4238a28593b7e6178c95431f91ca8c24e45fa7eb', 'src/third_party/apache-mime4j': Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a', diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py index 0b61403..6be2efb 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.1' +ANDROID_SDK_BUILD_TOOLS_VERSION = '23.0.0' 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 eaba251..5b05435 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.1', + 'android_sdk_build_tools_version%': '23.0.0', '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 19ed535..7ca1b70 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.1" + default_android_sdk_build_tools_version = "23.0.0" } 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 c777fbd..4e38b93 100644 --- a/build/secondary/third_party/android_tools/BUILD.gn +++ b/build/secondary/third_party/android_tools/BUILD.gn @@ -33,7 +33,6 @@ 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_collapsed.png b/chrome/android/java/res/drawable-hdpi/ic_collapse.png Binary files differindex 6a08d2a..6a08d2a 100644 --- a/chrome/android/java/res/drawable-hdpi/ic_collapsed.png +++ b/chrome/android/java/res/drawable-hdpi/ic_collapse.png diff --git a/chrome/android/java/res/drawable-hdpi/ic_expanded.png b/chrome/android/java/res/drawable-hdpi/ic_expand.png Binary files differindex d9a7dc4..d9a7dc4 100644 --- a/chrome/android/java/res/drawable-hdpi/ic_expanded.png +++ b/chrome/android/java/res/drawable-hdpi/ic_expand.png diff --git a/chrome/android/java/res/drawable-mdpi/ic_collapsed.png b/chrome/android/java/res/drawable-mdpi/ic_collapse.png Binary files differindex 94c6b77..94c6b77 100644 --- a/chrome/android/java/res/drawable-mdpi/ic_collapsed.png +++ b/chrome/android/java/res/drawable-mdpi/ic_collapse.png diff --git a/chrome/android/java/res/drawable-mdpi/ic_expanded.png b/chrome/android/java/res/drawable-mdpi/ic_expand.png Binary files differindex 386af07..386af07 100644 --- a/chrome/android/java/res/drawable-mdpi/ic_expanded.png +++ b/chrome/android/java/res/drawable-mdpi/ic_expand.png diff --git a/chrome/android/java/res/drawable-xhdpi/ic_collapsed.png b/chrome/android/java/res/drawable-xhdpi/ic_collapse.png Binary files differindex 6e35277..6e35277 100644 --- a/chrome/android/java/res/drawable-xhdpi/ic_collapsed.png +++ b/chrome/android/java/res/drawable-xhdpi/ic_collapse.png diff --git a/chrome/android/java/res/drawable-xhdpi/ic_expanded.png b/chrome/android/java/res/drawable-xhdpi/ic_expand.png Binary files differindex 95c3a27..95c3a27 100644 --- a/chrome/android/java/res/drawable-xhdpi/ic_expanded.png +++ b/chrome/android/java/res/drawable-xhdpi/ic_expand.png diff --git a/chrome/android/java/res/drawable-xxhdpi/ic_collapsed.png b/chrome/android/java/res/drawable-xxhdpi/ic_collapse.png Binary files differindex 78e8ca1..78e8ca1 100644 --- a/chrome/android/java/res/drawable-xxhdpi/ic_collapsed.png +++ b/chrome/android/java/res/drawable-xxhdpi/ic_collapse.png diff --git a/chrome/android/java/res/drawable-xxhdpi/ic_expanded.png b/chrome/android/java/res/drawable-xxhdpi/ic_expand.png Binary files differindex 5844525..5844525 100644 --- a/chrome/android/java/res/drawable-xxhdpi/ic_expanded.png +++ b/chrome/android/java/res/drawable-xxhdpi/ic_expand.png diff --git a/chrome/android/java/res/drawable-xxxhdpi/ic_collapsed.png b/chrome/android/java/res/drawable-xxxhdpi/ic_collapse.png Binary files differindex fb78a61..fb78a61 100644 --- a/chrome/android/java/res/drawable-xxxhdpi/ic_collapsed.png +++ b/chrome/android/java/res/drawable-xxxhdpi/ic_collapse.png diff --git a/chrome/android/java/res/drawable-xxxhdpi/ic_expanded.png b/chrome/android/java/res/drawable-xxxhdpi/ic_expand.png Binary files differindex 483f541..483f541 100644 --- a/chrome/android/java/res/drawable-xxxhdpi/ic_expanded.png +++ b/chrome/android/java/res/drawable-xxxhdpi/ic_expand.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 9f1f26f..9eb2496 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_expanded)); + TintedDrawable.constructTintedDrawable(getResources(), R.drawable.ic_expand)); TintedDrawable collapse = - TintedDrawable.constructTintedDrawable(getResources(), R.drawable.ic_collapsed); + TintedDrawable.constructTintedDrawable(getResources(), R.drawable.ic_collapse); 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 ade5d12..79d7d9d 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 @@ -1211,13 +1211,10 @@ 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. - if (id == 0) { - mSecurityButton.setImageDrawable(null); - } else { - mSecurityButton.setImageResource(id); - } + mSecurityButton.setImageResource( + getSecurityIconResource(securityLevel, !shouldEmphasizeHttpsScheme())); if (mSecurityIconType == securityLevel) return; mSecurityIconType = securityLevel; @@ -1287,7 +1284,7 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener, mNavigationButton.setImageResource(R.drawable.ic_omnibox_magnifier); break; case EMPTY: - mNavigationButton.setImageDrawable(null); + mNavigationButton.setImageResource(0); 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 021ece7..a7534c4 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(getActivity())) { + if (!ContextualSearchFieldTrial.isEnabled(getContext())) { 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 3942175..32cd4e9 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_expanded : R.drawable.ic_collapsed); + mAllowListExpanded ? R.drawable.ic_expand : R.drawable.ic_collapse); 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_expanded : R.drawable.ic_collapsed); + mBlockListExpanded ? R.drawable.ic_expand : R.drawable.ic_collapse); 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 49b02da..df87a09 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,14 +367,9 @@ 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. - if (id == 0) { - mSecurityButton.setImageDrawable(null); - } else { - mSecurityButton.setImageResource(id); - } + mSecurityButton.setImageResource(LocationBarLayout.getSecurityIconResource( + securityLevel, !shouldEmphasizeHttpsScheme())); mAnimDelegate.showSecurityButton(); } mUrlBar.emphasizeUrl(); |