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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.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: Rebase 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/java/res/values-ldpi/contextual_search_crushed_sprite_frames.xml ('K') | « chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelDelegate.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java

index c071d90d6ed9c6df8d3fc065905cf6f9c60f8048..d40bef8f7aee10284d81c78525cfbd366f6527c2 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java

@@ -60,6 +60,12 @@ public class ContextualSearchSceneLayer extends SceneLayer {

boolean searchBarShadowVisible = mSearchPanel.getSearchBarShadowVisible();

float searchBarShadowOpacity = mSearchPanel.getSearchBarShadowOpacity();

+ boolean searchProviderIconSpriteVisible = mSearchPanel.isSearchProviderIconSpriteVisible();

+ float searchProviderIconSpriteSize = mSearchPanel.getSearchProviderIconSpriteSize();

+ int[] searchProviderIconSpriteRects = mSearchPanel.getSearchProviderIconSpriteFrameRects();

+ boolean searchProviderIconSpritePaintPreviousFrames =

+ mSearchPanel.shouldPaintPreviousSearchProviderIconSpriteFrames();

float arrowIconOpacity = mSearchPanel.getArrowIconOpacity();

float arrowIconRotation = mSearchPanel.getArrowIconRotation();

@@ -76,7 +82,7 @@ public class ContextualSearchSceneLayer extends SceneLayer {

searchContextViewId,

searchTermViewId,

R.drawable.contextual_search_bar_shadow,

- R.drawable.google_icon,

+ R.drawable.google_icon_sprite,

R.drawable.breadcrumb_arrow,

ContextualSearchPanel.CLOSE_ICON_DRAWABLE_ID,

R.drawable.progress_bar_background,

@@ -99,6 +105,10 @@ public class ContextualSearchSceneLayer extends SceneLayer {

searchBarBorderHeight * mDpToPx,

searchBarShadowVisible,

searchBarShadowOpacity,

+ searchProviderIconSpriteVisible,

+ searchProviderIconSpriteSize,

+ searchProviderIconSpriteRects,

+ searchProviderIconSpritePaintPreviousFrames,

arrowIconOpacity,

arrowIconRotation,

closeIconOpacity,

@@ -157,6 +167,10 @@ public class ContextualSearchSceneLayer extends SceneLayer {

float searchBarBorderHeight,

boolean searchBarShadowVisible,

float searchBarShadowOpacity,

+ boolean searchProviderIconSpriteVisible,

+ float searchProviderIconSpriteSize,

+ int[] searchProviderIconSpriteRects,

+ boolean searchProviderIconSpritePaintPreviousFrames,

float arrowIconOpacity,

float arrowIconRotation,

float closeIconOpacity,