[Contextual Search] Add support for crushed sprites and animate the search provider icon

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

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 ed13d4662d0f890495e923b708de50125da39268..0c8b0ea0a2153f010154ab33bc63283c08fa20d6 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
@@ -69,12 +69,18 @@ public class ContextualSearchSceneLayer extends SceneLayer {
         float progressBarOpacity = mSearchPanel.getProgressBarOpacity();
         int progressBarCompletion = mSearchPanel.getProgressBarCompletion();
 
+        boolean searchProviderIconSpriteVisible = mSearchPanel.isSearchProviderIconSpriteVisible();

[pedro (no code reviews), 2015/09/29 01:14:40]

Nit: Move these a few lines above, right after the line:

float searchBarShadowOpacity = mSearchPanel.getSearchBarShadowOpacity();

This way we keep the variables declarations in the same order as the arguments
in the call below.

[Theresa, 2015/10/01 01:57:31]

Done.

+        float searchProviderIconSpriteSize = mSearchPanel.getSearchProviderIconSpriteSize();
+        int[] searchProviderIconSpriteRects = mSearchPanel.getSearchProviderIconSpriteFrameRects();
+        boolean searchProviderIconSpritePaintPreviousFrames =
+                mSearchPanel.getSearchProviderIconSpritePaintPreviousFrames();
+
         nativeUpdateContextualSearchLayer(mNativePtr,
                 R.drawable.contextual_search_bar_background,
                 R.id.contextual_search_context_view,
                 R.id.contextual_search_term_view,
                 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,
@@ -97,6 +103,10 @@ public class ContextualSearchSceneLayer extends SceneLayer {
                 searchBarBorderHeight * mDpToPx,
                 searchBarShadowVisible,
                 searchBarShadowOpacity,
+                searchProviderIconSpriteVisible,
+                searchProviderIconSpriteSize,
+                searchProviderIconSpriteRects,
+                searchProviderIconSpritePaintPreviousFrames,
                 arrowIconOpacity,
                 arrowIconRotation,
                 closeIconVisible,
@@ -156,6 +166,10 @@ public class ContextualSearchSceneLayer extends SceneLayer {
             float searchBarBorderHeight,
             boolean searchBarShadowVisible,
             float searchBarShadowOpacity,
+            boolean searchProviderIconSpriteVisible,
+            float searchProviderIconSpriteSize,
+            int[] searchProviderIconSpriteRects,
+            boolean searchProviderIconSpritePaintPreviousFrames,
             float arrowIconOpacity,
             float arrowIconRotation,
             boolean closeIconVisible,