summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jiaming Liu <jiamingliu@google.com> 2024-05-30 04:02:11 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-05-30 04:02:11 +0000
commita3b84225c21ee06e6fb6783e032e17f8958dc2d9 (patch)
tree40e73827fbb6c7bcdcc1d8cf784fb56df36c53c7
parentc49e1919a09b61e29165a4cb08761f8792a30089 (diff)
parent65485b116c8f19908d56d9b6147eb094b38311fa (diff)
Merge "[Divider] Disable drag-to-fullscreen" into main
-rw-r--r--libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/DividerPresenter.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/DividerPresenter.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/DividerPresenter.java
index 259b1f8c049b..774b2129497d 100644
--- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/DividerPresenter.java
+++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/DividerPresenter.java
@@ -851,8 +851,8 @@ class DividerPresenter implements View.OnTouchListener {
private static boolean isDraggingToFullscreenAllowed(
@NonNull DividerAttributes dividerAttributes) {
// TODO(b/293654166) Use DividerAttributes.isDraggingToFullscreenAllowed when extension is
- // updated.
- return true;
+ // updated to v7.
+ return false;
}
/**