From 01be9d1de99a1ab90dd8002eeed280a31417e053 Mon Sep 17 00:00:00 2001 From: Zach Katz Date: Thu, 1 Jun 2023 18:26:10 +0000 Subject: [PATCH] [PCCT-SideSheet] No shadow margins during minimization (cherry picked from commit 670de7a13924babf106a154edc4100a67e73eba5) Bug: 1449946, 1434222 Change-Id: I79eaed742cea5f8e274dec50107f726b4201f0c1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4569101 Code-Coverage: Findit Reviewed-by: Kevin Grosu Commit-Queue: Zach Katz Cr-Original-Commit-Position: refs/heads/main@{#1150942} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4579830 Bot-Commit: Rubber Stamper Commit-Queue: Kevin Grosu Auto-Submit: Zach Katz Cr-Commit-Position: refs/branch-heads/5790@{#228} Cr-Branched-From: 1d71a337b1f6e707a13ae074dca1e2c34905eb9f-refs/heads/main@{#1148114} --- .../partialcustomtab/PartialCustomTabSideSheetStrategy.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabSideSheetStrategy.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabSideSheetStrategy.java index e6e60233d27fd..6b64d7d6de8ec 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabSideSheetStrategy.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabSideSheetStrategy.java @@ -162,9 +162,6 @@ boolean toggleMaximize(boolean animate) { if (mIsMaximized) { if (shouldDrawDividerLine()) resetCoordinatorLayoutInsets(); setTopMargins(0, 0); - } else { - if (shouldDrawDividerLine()) drawDividerLine(); - updateShadowOffset(); } AnimatorUpdateListener updateListener; @@ -219,6 +216,8 @@ private void onMaximizeEnd() { maybeResetTalkbackFocus(); } initializeSize(); + if (shouldDrawDividerLine()) drawDividerLine(); + updateShadowOffset(); maybeInvokeResizeCallback(); }); }