Commit 7a787c81 authored by Jinsuk Kim's avatar Jinsuk Kim Committed by Commit Bot

Android: Keep bottom toolbar hidden for overlay panels

Bottom toolbar animation in Chrome duet mode was hidden
behind the ephemeral tab in peek mode. This CL keeps the
toolbar entirely hidden while overlay panel is showing.


Bug: 894619
Change-Id: Ib6147629a3eb939d367e14a7359823a9eae64333
Reviewed-on: https://chromium-review.googlesource.com/c/1359992Reviewed-by: default avatarMatthew Jones <mdjones@chromium.org>
Reviewed-by: default avatarDonn Denman <donnd@chromium.org>
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615777}
parent c1928d6b
...@@ -66,6 +66,9 @@ class BrowsingModeBottomToolbarMediator ...@@ -66,6 +66,9 @@ class BrowsingModeBottomToolbarMediator
/** A provider that notifies components when the theme color changes.*/ /** A provider that notifies components when the theme color changes.*/
private ThemeColorProvider mThemeColorProvider; private ThemeColorProvider mThemeColorProvider;
/** A state set to {@code true} while any overlay panel is showing. */
private boolean mIsOverlayPanelShowing;
/** /**
* Build a new mediator that handles events from outside the bottom toolbar. * Build a new mediator that handles events from outside the bottom toolbar.
* @param model The {@link BrowsingModeBottomToolbarModel} that holds all the state for the * @param model The {@link BrowsingModeBottomToolbarModel} that holds all the state for the
...@@ -216,11 +219,13 @@ class BrowsingModeBottomToolbarMediator ...@@ -216,11 +219,13 @@ class BrowsingModeBottomToolbarMediator
@Override @Override
public void onOverlayPanelShown() { public void onOverlayPanelShown() {
mIsOverlayPanelShowing = true;
mModel.set(BrowsingModeBottomToolbarModel.ANDROID_VIEW_VISIBLE, false); mModel.set(BrowsingModeBottomToolbarModel.ANDROID_VIEW_VISIBLE, false);
} }
@Override @Override
public void onOverlayPanelHidden() { public void onOverlayPanelHidden() {
mIsOverlayPanelShowing = false;
tryShowingAndroidView(); tryShowingAndroidView();
} }
...@@ -270,6 +275,7 @@ class BrowsingModeBottomToolbarMediator ...@@ -270,6 +275,7 @@ class BrowsingModeBottomToolbarMediator
*/ */
private void tryShowingAndroidView() { private void tryShowingAndroidView() {
if (mFullscreenManager.getBottomControlOffset() > 0) return; if (mFullscreenManager.getBottomControlOffset() > 0) return;
if (mIsOverlayPanelShowing) return;
if (mModel.get(BrowsingModeBottomToolbarModel.Y_OFFSET) != 0) return; if (mModel.get(BrowsingModeBottomToolbarModel.Y_OFFSET) != 0) return;
mModel.set(BrowsingModeBottomToolbarModel.ANDROID_VIEW_VISIBLE, true); mModel.set(BrowsingModeBottomToolbarModel.ANDROID_VIEW_VISIBLE, true);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment