[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..dddd5e89ace785fdd09ee701fe42b5f51d47203f 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,17 @@ public class ContextualSearchSceneLayer extends SceneLayer {
         float progressBarOpacity = mSearchPanel.getProgressBarOpacity();
         int progressBarCompletion = mSearchPanel.getProgressBarCompletion();
 
+        boolean searchProviderIconVisible = mSearchPanel.isSearchProviderIconVisible();
+        int searchProviderIconSpritesPerRow = mSearchPanel.getSearchProviderIconSpritesPerRow();
+        int searchProviderIconSpriteRows = mSearchPanel.getSearchProviderIconSpriteRows();
+        int searchProviderIconSpriteFrame = mSearchPanel.getSearchProviderIconSpriteFrame();
+
         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 +102,10 @@ public class ContextualSearchSceneLayer extends SceneLayer {
                 searchBarBorderHeight * mDpToPx,
                 searchBarShadowVisible,
                 searchBarShadowOpacity,
+                searchProviderIconVisible,
+                searchProviderIconSpritesPerRow,
+                searchProviderIconSpriteRows,
+                searchProviderIconSpriteFrame,
                 arrowIconOpacity,
                 arrowIconRotation,
                 closeIconVisible,
@@ -156,6 +165,10 @@ public class ContextualSearchSceneLayer extends SceneLayer {
             float searchBarBorderHeight,
             boolean searchBarShadowVisible,
             float searchBarShadowOpacity,
+            boolean searchProviderIconVisible,
+            int searchProviderIconSpritesPerRow,
+            int searchProviderIconSpriteRows,
+            int searchProviderIconSpriteFrame,
             float arrowIconOpacity,
             float arrowIconRotation,
             boolean closeIconVisible,