Commit a1c55576 authored by Brandon Wylie's avatar Brandon Wylie Committed by Chromium LUCI CQ

Fix scrolling condition in getUrlBarTranslationXForToolbarAnimation

Bug: 1158272
Change-Id: I86da7a24ce0f182de56548479e6381689efa9c46
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2587873Reviewed-by: default avatarFilip Gorski <fgorski@chromium.org>
Commit-Queue: Brandon Wylie <wylieb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836886}
parent 24cec99c
...@@ -2831,9 +2831,8 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC ...@@ -2831,9 +2831,8 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC
float translation = float translation =
urlExpansionPercent * statusCoordinator.getEndPaddingPixelSizeOnFocusDelta(); urlExpansionPercent * statusCoordinator.getEndPaddingPixelSizeOnFocusDelta();
boolean scrollingOnNtp = boolean scrollingOnNtp = !hasFocus && statusCoordinator.isSearchEngineStatusIconVisible()
getToolbarDataProvider().getNewTabPageDelegate().isCurrentlyVisible() && !hasFocus && UrlUtilities.isNTPUrl(getToolbarDataProvider().getCurrentUrl());
&& statusCoordinator.isSearchEngineStatusIconVisible();
if (scrollingOnNtp) { if (scrollingOnNtp) {
// When: // When:
// 1. unfocusing the LocationBar on the NTP. // 1. unfocusing the LocationBar on the NTP.
......
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