chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java - Issue 1958233002: Reland of Update NTP to new material design spec.

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/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java

Issue 1958233002: Reland of Update NTP to new material design spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java

index a0c2500de2d182aa32d3a340de56a08016880d57..0bf684ff3efc9c0c26eb463aef53ef1d0f4872e0 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java

@@ -11,7 +11,6 @@

import android.content.Context;

import android.content.Intent;

import android.graphics.Canvas;

-import android.graphics.Color;

import android.graphics.Rect;

import android.net.Uri;

import android.os.Build;

@@ -582,9 +581,7 @@

mProfile = tab.getProfile();

mTitle = activity.getResources().getString(R.string.button_new_tab);

- mBackgroundColor = ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_SNIPPETS)

- ? ApiCompatibilityUtils.getColor(activity.getResources(), R.color.ntp_with_cards_bg)

- : ApiCompatibilityUtils.getColor(activity.getResources(), R.color.ntp_bg);

+ mBackgroundColor = NtpColorUtils.getBackgroundColorResource(activity.getResources());

mThemeColor = ApiCompatibilityUtils.getColor(

activity.getResources(), R.color.default_primary_color);

TemplateUrlService.getInstance().addObserver(this);

@@ -815,7 +812,9 @@

@Override

public int getThemeColor() {

- return isLocationBarShownInNTP() ? Color.WHITE : mThemeColor;

+ return isLocationBarShownInNTP()

+ ? NtpColorUtils.getBackgroundColorResource(mActivity.getResources())

+ : mThemeColor;

}

@Override