[ContextualSearch] Adds long press promo for Contextual Search.

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 c071d90d6ed9c6df8d3fc065905cf6f9c60f8048..8f6aeb38fbaa573074e8986e535ab76f788a32d5 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
@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.compositor.scene_layer;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel;
+import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPeekPromoControl;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.ui.resources.ResourceManager;
 
@@ -38,11 +39,21 @@ public class ContextualSearchSceneLayer extends SceneLayer {
     public void update(@Nullable ContentViewCore contentViewCore, ResourceManager resourceManager) {
         int searchContextViewId = mSearchPanel.getSearchContextViewId();
         int searchTermViewId = mSearchPanel.getSearchTermViewId();
+        int peekPromoRippleResourceId = R.drawable.contextual_search_promo_ripple;
+        int peekPromoTextResourceId = R.id.contextual_search_peek_promo;

[Theresa, 2015/10/02 17:34:45]

nit: for consistency I would inline these below (on line 95/96) like we do for
other R.id/R.drawables that are passed directly.

[pedro (no code reviews), 2015/10/02 20:29:08]

Good point.

 
         boolean searchPromoVisible = mSearchPanel.getPromoVisible();
         float searchPromoHeightPx = mSearchPanel.getPromoHeightPx();
         float searchPromoOpacity = mSearchPanel.getPromoOpacity();
 
+        ContextualSearchPeekPromoControl peekPromoControl = mSearchPanel.getPeekPromoControl();
+        boolean searchPeekPromoVisible = peekPromoControl.isVisible();
+        float searchPeekPromoHeightPx = peekPromoControl.getHeightPx();
+        float searchPeekPromoPaddingPx = peekPromoControl.getPaddingPx();
+        float searchPeekPromoRippleWidthPx = peekPromoControl.getRippleWidthPx();
+        float searchPeekPromoRippleOpacity = peekPromoControl.getRippleOpacity();
+        float searchPeekPromoTextOpacity = peekPromoControl.getTextOpacity();
+
         float searchPanelX = mSearchPanel.getOffsetX();
         float searchPanelY = mSearchPanel.getOffsetY();
         float searchPanelWidth = mSearchPanel.getWidth();
@@ -54,7 +65,6 @@ public class ContextualSearchSceneLayer extends SceneLayer {
         float searchTermOpacity = mSearchPanel.getSearchBarTermOpacity();
 
         boolean searchBarBorderVisible = mSearchPanel.isSearchBarBorderVisible();
-        float searchBarBorderY = mSearchPanel.getSearchBarBorderY();
         float searchBarBorderHeight = mSearchPanel.getSearchBarBorderHeight();
 
         boolean searchBarShadowVisible = mSearchPanel.getSearchBarShadowVisible();
@@ -66,7 +76,7 @@ public class ContextualSearchSceneLayer extends SceneLayer {
         float closeIconOpacity = mSearchPanel.getCloseIconOpacity();
 
         boolean isProgressBarVisible = mSearchPanel.isProgressBarVisible();
-        float progressBarY = mSearchPanel.getProgressBarY();
+
         float progressBarHeight = mSearchPanel.getProgressBarHeight();
         float progressBarOpacity = mSearchPanel.getProgressBarOpacity();
         int progressBarCompletion = mSearchPanel.getProgressBarCompletion();
@@ -82,10 +92,18 @@ public class ContextualSearchSceneLayer extends SceneLayer {
                 R.drawable.progress_bar_background,
                 R.drawable.progress_bar_foreground,
                 R.id.contextual_search_opt_out_promo,
+                peekPromoRippleResourceId,
+                peekPromoTextResourceId,
                 contentViewCore,
                 searchPromoVisible,
                 searchPromoHeightPx,
                 searchPromoOpacity,
+                searchPeekPromoVisible,
+                searchPeekPromoHeightPx,
+                searchPeekPromoPaddingPx,
+                searchPeekPromoRippleWidthPx,
+                searchPeekPromoRippleOpacity,
+                searchPeekPromoTextOpacity,
                 searchPanelX * mDpToPx,
                 searchPanelY * mDpToPx,
                 searchPanelWidth * mDpToPx,
@@ -95,7 +113,6 @@ public class ContextualSearchSceneLayer extends SceneLayer {
                 searchContextOpacity,
                 searchTermOpacity,
                 searchBarBorderVisible,
-                searchBarBorderY * mDpToPx,
                 searchBarBorderHeight * mDpToPx,
                 searchBarShadowVisible,
                 searchBarShadowOpacity,
@@ -103,7 +120,6 @@ public class ContextualSearchSceneLayer extends SceneLayer {
                 arrowIconRotation,
                 closeIconOpacity,
                 isProgressBarVisible,
-                progressBarY * mDpToPx,
                 progressBarHeight * mDpToPx,
                 progressBarOpacity,
                 progressBarCompletion,
@@ -140,10 +156,18 @@ public class ContextualSearchSceneLayer extends SceneLayer {
             int progressBarBackgroundResourceId,
             int progressBarResourceId,
             int searchPromoResourceId,
+            int peekPromoRippleResourceId,
+            int peekPromoTextResourceId,
             ContentViewCore contentViewCore,
             boolean searchPromoVisible,
             float searchPromoHeight,
             float searchPromoOpacity,
+            boolean searchPeekPromoVisible,
+            float searchPeekPromoHeight,
+            float searchPeekPromoPaddingPx,
+            float searchPeekPromoRippleWidth,
+            float searchPeekPromoRippleOpacity,
+            float searchPeekPromoTextOpacity,
             float searchPanelX,
             float searchPanelY,
             float searchPanelWidth,
@@ -153,7 +177,6 @@ public class ContextualSearchSceneLayer extends SceneLayer {
             float searchContextOpacity,
             float searchTermOpacity,
             boolean searchBarBorderVisible,
-            float searchBarBorderY,
             float searchBarBorderHeight,
             boolean searchBarShadowVisible,
             float searchBarShadowOpacity,
@@ -161,7 +184,6 @@ public class ContextualSearchSceneLayer extends SceneLayer {
             float arrowIconRotation,
             float closeIconOpacity,
             boolean isProgressBarVisible,
-            float progressBarY,
             float progressBarHeight,
             float progressBarOpacity,
             int progressBarCompletion,