commit 3e42379d3cbdd6641a6f7c9b36125e29c1ce8c43
author Matt Sziklay <mattsziklay@google.com> Mon Mar 11 16:58:56 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 11 16:58:56 2024 +0000
tree 5b8324a7e134f0aadd8e3512626376ed083922f2
parent 40ad015e8ed89aea7a616908b77772fb863d54d6
parent 75096e2c285e39341c159eca87e6c32d81fe8099

Merge "Do not create indicator before startDragToDesktop." into main

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
index 9c01442..98ff0ee 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
@@ -866,6 +866,12 @@
                     return;
                 }
                 if (mTransitionDragActive) {
+                    // Do not create an indicator at all if we're not past transition height.
+                    if (ev.getRawY() < mContext.getResources().getDimensionPixelSize(com.android
+                            .wm.shell.R.dimen.desktop_mode_fullscreen_from_desktop_height)
+                            && mMoveToDesktopAnimator == null) {
+                        return;
+                    }
                     final DesktopModeVisualIndicator.IndicatorType indicatorType =
                             mDesktopTasksController.updateVisualIndicator(
                                     relevantDecor.mTaskInfo,