From 3efd4ea59f6f0caebe54fbb55997bc5c7be1dd50 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Mon, 10 Feb 2025 13:59:00 -0700 Subject: [PATCH] playback: fix playback sheet hiding on pre-U back Caused by a missed check. --- .../material/bottomsheet/BackportBottomSheetBehavior.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/google/android/material/bottomsheet/BackportBottomSheetBehavior.java b/app/src/main/java/com/google/android/material/bottomsheet/BackportBottomSheetBehavior.java index 1ca251dc0..50ef29e94 100644 --- a/app/src/main/java/com/google/android/material/bottomsheet/BackportBottomSheetBehavior.java +++ b/app/src/main/java/com/google/android/material/bottomsheet/BackportBottomSheetBehavior.java @@ -1633,12 +1633,13 @@ public class BackportBottomSheetBehavior extends CoordinatorLayo return; } BackEventCompat backEvent = bottomContainerBackHelper.onHandleBackInvoked(); + boolean canActuallyHide = hideable && isHideableWhenDragging(); if (backEvent == null || VERSION.SDK_INT < VERSION_CODES.UPSIDE_DOWN_CAKE) { // If using traditional button system nav or if pre-U, just hide or collapse the bottom sheet. - setState(hideable ? STATE_HIDDEN : STATE_COLLAPSED); + setState(canActuallyHide ? STATE_HIDDEN : STATE_COLLAPSED); return; } - if (hideable && isHideableWhenDragging()) { + if (canActuallyHide) { bottomContainerBackHelper.finishBackProgressNotPersistent( backEvent, new AnimatorListenerAdapter() {