45 lines
2.3 KiB
Diff
45 lines
2.3 KiB
Diff
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
|
|
index e097a6fb6dea13e7a74eabbc9cc2dfddf5477bce..a201f2bbfca3a80e9faf9f48b47b50d6011ea07b 100644
|
|
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
|
|
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
|
|
@@ -587,6 +587,7 @@ public class ToolbarPhone extends ToolbarLayout
|
|
if (mOptionalButtonCoordinator != null) {
|
|
mOptionalButtonCoordinator.setBackgroundColorFilter(color);
|
|
}
|
|
+ BraveToolbarLayout.class.cast(this).updateModernLocationBarColorImpl(color);
|
|
}
|
|
|
|
private void updateModernLocationBarCorners() {
|
|
@@ -1272,6 +1273,7 @@ public class ToolbarPhone extends ToolbarLayout
|
|
* Tab Page.
|
|
*/
|
|
private void updateLocationBarLayoutForExpansionAnimation() {
|
|
+ if (!BraveToolbarLayout.class.cast(this).isLocationBarValid(mLocationBar)) return;
|
|
TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation");
|
|
if (isInTabSwitcherMode()) return;
|
|
|
|
@@ -1689,6 +1691,7 @@ public class ToolbarPhone extends ToolbarLayout
|
|
}
|
|
}
|
|
|
|
+ BraveToolbarLayout.class.cast(this).drawAnimationOverlay(mToolbarButtonsContainer, canvas);
|
|
// Draw the tab stack button and associated text if necessary.
|
|
ToggleTabStackButtonCoordinator tabSwitcherButtonCoordinator =
|
|
getTabSwitcherButtonCoordinator();
|
|
@@ -2075,6 +2078,7 @@ public class ToolbarPhone extends ToolbarLayout
|
|
@Override
|
|
public void onHomeButtonIsEnabledUpdate(boolean homeButtonEnabled) {
|
|
mIsHomeButtonEnabled = homeButtonEnabled;
|
|
+ mIsHomeButtonEnabled = false;
|
|
updateButtonVisibility();
|
|
}
|
|
|
|
@@ -2488,6 +2492,7 @@ public class ToolbarPhone extends ToolbarLayout
|
|
} else {
|
|
populateUrlClearExpansionAnimatorSet(animators);
|
|
}
|
|
+ if (!BraveToolbarLayout.class.cast(this).isLocationBarValid(mLocationBar)) return;
|
|
mUrlFocusLayoutAnimator = new AnimatorSet();
|
|
mUrlFocusLayoutAnimator.playTogether(animators);
|
|
|