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

Unified Diff: chrome/android/java_staging/src/org/chromium/chrome/browser/compositor/layouts/phone/ContextualSearchLayout.java

Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: final patch? Created 5 years, 7 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_staging/src/org/chromium/chrome/browser/compositor/layouts/phone/ContextualSearchLayout.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/compositor/layouts/phone/ContextualSearchLayout.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/compositor/layouts/phone/ContextualSearchLayout.java
new file mode 100644
index 0000000000000000000000000000000000000000..8de83ecf1c6e27cd7f269857d572fda4f7d5ffd8
--- /dev/null
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/compositor/layouts/phone/ContextualSearchLayout.java
@@ -0,0 +1,246 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.compositor.layouts.phone;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.view.View;
+
+import org.chromium.chrome.browser.Tab;
+import org.chromium.chrome.browser.compositor.LayerTitleCache;
+import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel;
+import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel.StateChangeReason;
+import org.chromium.chrome.browser.compositor.layouts.ContextualSearchSupportedLayout;
+import org.chromium.chrome.browser.compositor.layouts.Layout;
+import org.chromium.chrome.browser.compositor.layouts.LayoutRenderHost;
+import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
+import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab;
+import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeEventFilter.ScrollDirection;
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.EventFilter;
+import org.chromium.chrome.browser.compositor.scene_layer.SceneLayer;
+import org.chromium.chrome.browser.compositor.scene_layer.TabListSceneLayer;
+import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
+import org.chromium.chrome.browser.util.MathUtils;
+import org.chromium.content.browser.ContentViewCore;
+import org.chromium.content_public.common.TopControlsState;
+import org.chromium.ui.resources.ResourceManager;
+
+/**
+ * A {@link Layout} that shows a Contextual Search overlay at the bottom.
+ */
+public class ContextualSearchLayout extends ContextualSearchSupportedLayout {
+ /**
+ * The height of the Toolbar in dps.
+ * TODO(pedrosimonetti): Get this value from the Toolbar code.
+ */
+ private static final float TOOLBAR_HEIGHT_DP = 56.f;
+
+ /**
+ * The initial Y position of the touch event.
+ */
+ private float mInitialPanelTouchY;
+
+ /**
+ * The base Tab.
+ */
+ private LayoutTab mBaseTab;
+
+ private final TabListSceneLayer mTabListSceneLayer;
+
+ /**
+ * @param context The current Android context.
+ * @param updateHost The {@link LayoutUpdateHost} view for this layout.
+ * @param renderHost The {@link LayoutRenderHost} view for this layout.
+ * @param eventFilter The {@link EventFilter} that is needed for this view.
+ */
+ public ContextualSearchLayout(Context context, LayoutUpdateHost updateHost,
+ LayoutRenderHost renderHost, EventFilter eventFilter, ContextualSearchPanel panel) {
+ super(context, updateHost, renderHost, eventFilter, panel);
+ mTabListSceneLayer = new TabListSceneLayer();
+ // TODO(changwan): use SceneOverlayTree's setContentTree() instead once we refactor
+ // ContextualSearchSupportedLayout into LayoutHelper.
+ mTabListSceneLayer.setContentTree(super.getSceneLayer());
+ }
+
+ @Override
+ public View getViewForInteraction() {
+ ContentViewCore content = mSearchPanel.getManagementDelegate().getSearchContentViewCore();
+ if (content != null) return content.getContainerView();
+ return super.getViewForInteraction();
+ }
+
+ @Override
+ public int getSizingFlags() {
+ return SizingFlags.HELPER_SUPPORTS_FULLSCREEN;
+ }
+
+ @Override
+ public float getTopControlsOffset(float currentOffsetDp) {
+ return MathUtils.clamp(mBaseTab.getY(), -TOOLBAR_HEIGHT_DP, Math.min(currentOffsetDp, 0f));
+ }
+
+ @Override
+ protected void updateLayout(long time, long dt) {
+ super.updateLayout(time, dt);
+ if (mBaseTab == null) return;
+
+ mBaseTab.setY(mSearchPanel.getBasePageY());
+ mBaseTab.setBrightness(mSearchPanel.getBasePageBrightness());
+
+ boolean needUpdate = mBaseTab.updateSnap(dt);
+ if (needUpdate) requestUpdate();
+ }
+
+ @Override
+ public boolean handlesTabCreating() {
+ // Prevents the new Tab animation from happening when promoting to a new Tab.
+ startHiding(mBaseTab.getId(), false);
+ doneHiding();
+ // Updates TopControls' State so the Toolbar becomes visible.
+ // TODO(pedrosimonetti): The transition when promoting to a new tab is only smooth
+ // if the SearchContentView's vertical scroll position is zero. Otherwise the
+ // ContentView will appear to jump in the screen. Coordinate with @dtrainor to solve
+ // this problem.
+ mSearchPanel.getManagementDelegate().updateTopControlsState(TopControlsState.BOTH, false);
+ return true;
+ }
+
+ @Override
+ public void show(long time, boolean animate) {
+ super.show(time, animate);
+
+ resetLayout();
+ createBaseLayoutTab(mBaseTab);
+
+ mSearchPanel.createSearchPromo();
+ }
+
+ /**
+ * Resets the Layout.
+ */
+ private void resetLayout() {
+ mLayoutTabs = null;
+ mBaseTab = null;
+ }
+
+ /**
+ * Creates the Base Page's LayoutTab to be presented in the screen.
+ *
+ * @param layoutTab The {@link Layout} instance.
+ */
+ private void createBaseLayoutTab(LayoutTab layoutTab) {
+ if (mTabModelSelector == null) return;
+
+ int baseTabId = mTabModelSelector.getCurrentTabId();
+ if (baseTabId == Tab.INVALID_TAB_ID) return;
+
+ mBaseTab = createLayoutTab(
+ baseTabId, mTabModelSelector.isIncognitoSelected(), NO_CLOSE_BUTTON, NO_TITLE);
+
+ assert mBaseTab != null;
+ mBaseTab.setScale(1.f);
+ mBaseTab.setBorderScale(1.f);
+ mBaseTab.setBorderAlpha(0.f);
+
+ mLayoutTabs = new LayoutTab[] {mBaseTab};
+ }
+
+ // ============================================================================================
+ // Panel Host
+ // ============================================================================================
+
+ @Override
+ protected void hideContextualSearch(boolean immediately) {
+ if (isActive() && mBaseTab != null) {
+ startHiding(mBaseTab.getId(), false);
+ if (immediately) doneHiding();
+ }
+ }
+
+ // ============================================================================================
+ // cc::Layer Events
+ // ============================================================================================
+
+ @Override
+ public void onDown(long time, float x, float y) {
+ mInitialPanelTouchY = y;
+ mSearchPanel.handleSwipeStart();
+ }
+
+ @Override
+ public void drag(long time, float x, float y, float deltaX, float deltaY) {
+ final float ty = y - mInitialPanelTouchY;
+
+ mSearchPanel.handleSwipeMove(ty);
+ }
+
+ @Override
+ public void onUpOrCancel(long time) {
+ mSearchPanel.handleSwipeEnd();
+ }
+
+ @Override
+ public void fling(long time, float x, float y, float velocityX, float velocityY) {
+ mSearchPanel.handleFling(velocityY);
+ }
+
+ @Override
+ public void click(long time, float x, float y) {
+ mSearchPanel.handleClick(time, x, y);
+ }
+
+ // ============================================================================================
+ // Android View Events
+ // ============================================================================================
+
+ @Override
+ public void swipeStarted(long time, ScrollDirection direction, float x, float y) {
+ mSearchPanel.handleSwipeStart();
+ }
+
+ @Override
+ public void swipeUpdated(long time, float x, float y, float dx, float dy, float tx, float ty) {
+ mSearchPanel.handleSwipeMove(ty);
+ }
+
+ @Override
+ public void swipeFlingOccurred(
+ long time, float x, float y, float tx, float ty, float vx, float vy) {
+ mSearchPanel.handleFling(vy);
+ }
+
+ @Override
+ public void swipeFinished(long time) {
+ mSearchPanel.handleSwipeEnd();
+ }
+
+ @Override
+ public void swipeCancelled(long time) {
+ swipeFinished(time);
+ }
+
+ @Override
+ public boolean onBackPressed() {
+ mSearchPanel.closePanel(StateChangeReason.BACK_PRESS, true);
+ return true;
+ }
+
+ @Override
+ protected SceneLayer getSceneLayer() {
+ return mTabListSceneLayer;
+ }
+
+ @Override
+ protected void updateSceneLayer(Rect viewport, Rect contentViewport,
+ LayerTitleCache layerTitleCache, TabContentManager tabContentManager,
+ ResourceManager resourceManager, ChromeFullscreenManager fullscreenManager) {
+ super.updateSceneLayer(viewport, contentViewport, layerTitleCache, tabContentManager,
+ resourceManager, fullscreenManager);
+ assert mTabListSceneLayer != null;
+ mTabListSceneLayer.pushLayers(getContext(), viewport, contentViewport, this,
+ layerTitleCache, tabContentManager, resourceManager);
+ }
+}

Powered by Google App Engine
This is Rietveld 408576698