Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd9baff4 authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Automerger Merge Worker
Browse files

Merge "Transition to fullscreen based on position of motion event" into udc-qpr-dev am: 35f7ed34 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23247979



Change-Id: I58378705e3c420e5fef2fbbde5b093e2f3f0ffcf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7202d2d4 35f7ed34

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+5 −3
Original line number Diff line number Diff line
@@ -574,14 +574,16 @@ class DesktopTasksController( 
     * Perform checks required on drag end. Move to fullscreen if drag ends in status bar area.

     *

     * @param taskInfo the task being dragged.

     * @param position position of surface when drag ends

     * @param position position of surface when drag ends.

     * @param y the Y position of the motion event.

     */

    fun onDragPositioningEnd(

            taskInfo: RunningTaskInfo,

            position: Point

            position: Point,

            y: Float

    ) {

        val statusBarHeight = getStatusBarHeight(taskInfo)

        if (position.y <= statusBarHeight && taskInfo.windowingMode == WINDOWING_MODE_FREEFORM) {

        if (y <= statusBarHeight && taskInfo.windowingMode == WINDOWING_MODE_FREEFORM) {

            moveToFullscreenWithAnimation(taskInfo, position)

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
                    mDragPositioningCallback.onDragPositioningEnd(

                            e.getRawX(dragPointerIdx), e.getRawY(dragPointerIdx));

                    mDesktopTasksController.ifPresent(c -> c.onDragPositioningEnd(taskInfo,

                            position));

                            position, e.getRawY()));

                    final boolean wasDragging = mIsDragging;

                    mIsDragging = false;

                    return wasDragging;