chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java - Issue 1237913002: [Contextual Search] Adds basic support for narrow Search Panel.

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

Issue 1237913002: [Contextual Search] Adds basic support for narrow Search Panel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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/src/org/chromium/chrome/browser/compositor/layouts/eventfilter/ContextualSearchEventFilter.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/eventfilter/ContextualSearchEventFilter.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.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 b4d87d7c918c8259acc9ce467db4d41172409e14..a1134cbf0b72949661aabc416dd62f9bcdaf3df1 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

@@ -41,8 +41,11 @@ public class ContextualSearchSceneLayer extends SceneLayer {

float searchPromoHeightPx = mSearchPanel.getPromoHeightPx();

float searchPromoOpacity = mSearchPanel.getPromoOpacity();

- float searchPanelY = mSearchPanel.getContextualSearchPanelY();

+ float searchPanelX = mSearchPanel.getOffsetX();

+ float searchPanelY = mSearchPanel.getOffsetY();

float searchPanelWidth = mSearchPanel.getWidth();

+ float searchPanelHeight = mSearchPanel.getHeight();

float searchBarMarginTop = mSearchPanel.getSearchBarMarginTop();

float searchBarMarginSide = mSearchPanel.getSearchBarMarginSide();

float searchBarHeight = mSearchPanel.getSearchBarHeight();

@@ -89,8 +92,10 @@ public class ContextualSearchSceneLayer extends SceneLayer {

searchPromoVisible,

searchPromoHeightPx,

searchPromoOpacity,

+ searchPanelX * mDpToPx,

searchPanelY * mDpToPx,

searchPanelWidth * mDpToPx,

+ searchPanelHeight * mDpToPx,

searchBarMarginTop * mDpToPx,

searchBarMarginSide * mDpToPx,

searchBarHeight * mDpToPx,

@@ -151,8 +156,10 @@ public class ContextualSearchSceneLayer extends SceneLayer {

boolean searchPromoVisible,

float searchPromoHeight,

float searchPromoOpacity,

+ float searchPanelX,

float searchPanelY,

float searchPanelWidth,

+ float searchPanelHeight,

float searchBarMarginTop,

float searchBarMarginSide,

float searchBarHeight,