chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java - Issue 1311613006: Update getColor calls that were deprecated in M.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java

Issue 1311613006: Update getColor calls that were deprecated in M. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java

index 939525d5c97cefa6022c408b640c74d6835a7684..5d3352e746e9e7af26fcdea30bebb2eaa3ed538d 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java

@@ -8,6 +8,7 @@ import android.graphics.Color;

import android.test.suitebuilder.annotation.SmallTest;

import android.text.TextUtils;

+import org.chromium.base.ApiCompatibilityUtils;

import org.chromium.base.ThreadUtils;

import org.chromium.base.test.util.Feature;

import org.chromium.base.test.util.UrlUtils;

@@ -79,7 +80,8 @@ public class BrandColorTest extends DocumentActivityTestBase {

super.startMainActivityWithURL(url);

mToolbar = (ToolbarPhone) getActivity().findViewById(R.id.toolbar);

mToolbarDataProvider = mToolbar.getToolbarDataProvider();

- mDefaultColor = getActivity().getResources().getColor(R.color.default_primary_color);

+ mDefaultColor = ApiCompatibilityUtils.getColor(getActivity().getResources(),

+ R.color.default_primary_color);

}

/**

@@ -184,6 +186,7 @@ public class BrandColorTest extends DocumentActivityTestBase {

return getActivity().getActivityTab().isShowingInterstitialPage();

}

}));

- checkForBrandColor(getActivity().getResources().getColor(R.color.default_primary_color));

+ checkForBrandColor(ApiCompatibilityUtils.getColor(

+ getActivity().getResources(), R.color.default_primary_color));

}