Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2474)

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

Issue 1379183003: [ContextualSearch] Adds long press promo for Contextual Search. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing David's comments and tweaking policy 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
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..56837a00cd3ead0d8a4b79ceeaf9e77389ea89d5 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;
@@ -43,6 +44,14 @@ public class ContextualSearchSceneLayer extends SceneLayer {
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 +63,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 +74,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 +90,18 @@ public class ContextualSearchSceneLayer extends SceneLayer {
R.drawable.progress_bar_background,
R.drawable.progress_bar_foreground,
R.id.contextual_search_opt_out_promo,
+ R.drawable.contextual_search_promo_ripple,
+ R.id.contextual_search_peek_promo,
contentViewCore,
searchPromoVisible,
searchPromoHeightPx,
searchPromoOpacity,
+ searchPeekPromoVisible,
+ searchPeekPromoHeightPx,
+ searchPeekPromoPaddingPx,
+ searchPeekPromoRippleWidthPx,
+ searchPeekPromoRippleOpacity,
+ searchPeekPromoTextOpacity,
searchPanelX * mDpToPx,
searchPanelY * mDpToPx,
searchPanelWidth * mDpToPx,
@@ -95,7 +111,6 @@ public class ContextualSearchSceneLayer extends SceneLayer {
searchContextOpacity,
searchTermOpacity,
searchBarBorderVisible,
- searchBarBorderY * mDpToPx,
searchBarBorderHeight * mDpToPx,
searchBarShadowVisible,
searchBarShadowOpacity,
@@ -103,7 +118,6 @@ public class ContextualSearchSceneLayer extends SceneLayer {
arrowIconRotation,
closeIconOpacity,
isProgressBarVisible,
- progressBarY * mDpToPx,
progressBarHeight * mDpToPx,
progressBarOpacity,
progressBarCompletion,
@@ -140,10 +154,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 +175,6 @@ public class ContextualSearchSceneLayer extends SceneLayer {
float searchContextOpacity,
float searchTermOpacity,
boolean searchBarBorderVisible,
- float searchBarBorderY,
float searchBarBorderHeight,
boolean searchBarShadowVisible,
float searchBarShadowOpacity,
@@ -161,7 +182,6 @@ public class ContextualSearchSceneLayer extends SceneLayer {
float arrowIconRotation,
float closeIconOpacity,
boolean isProgressBarVisible,
- float progressBarY,
float progressBarHeight,
float progressBarOpacity,
int progressBarCompletion,

Powered by Google App Engine
This is Rietveld 408576698