chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java - Issue 1337703002: [Contextual Search] Add support for crushed sprites and animate the search provider icon

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/contextualsearch/ContextualSearchManager.java

Issue 1337703002: [Contextual Search] Add support for crushed sprites and animate the search provider icon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Small changes from reviews Created 5 years, 2 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

« base/android/jni_array.cc ('K') | « chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java » ('j') | chrome/browser/android/compositor/layer/contextual_search_layer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

index 8c30ddb9974b797f0f7304e990888ebe114881ab..47d2f92960fe2498d4bd698034a3346bb0f08689 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

@@ -508,6 +508,10 @@ public class ContextualSearchManager extends ContextualSearchObservable

}

+ mSearchPanel.setShouldAnimateIconSprite(

+ ContextualSearchPolicy.getInstance(mActivity).shouldAnimateSearchProviderIcon(

pedro (no code reviews) 2015/10/28 18:31:14 ContextualSearchPolicy.getInstance(mActivity) -->

Theresa 2015/10/28 22:20:58 Done.

+ mSelectionController.getSelectionType(), mSearchPanel.isShowing()));

// TODO(donnd): although we are showing the bar here, we have not yet set the text!

// Refactor to show the bar and set the text at the same time!

// TODO(donnd): If there was a previously ongoing contextual search, we should ensure