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

Commit 48a749f0 authored by Tony Wickham's avatar Tony Wickham Committed by Automerger Merge Worker
Browse files

Merge "Fix couple of drag and drop issues from transient taskbar" into... 

Merge "Fix couple of drag and drop issues from transient taskbar" into tm-qpr-dev am: 974cdc68 am: c34f0379

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



Change-Id: Iff7cba436aca572f69f2b3ccc42faddc1c598cef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b688e65 c34f0379

libs/WindowManager/Shell/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ filegroup { 
        "src/com/android/wm/shell/animation/Interpolators.java",

        "src/com/android/wm/shell/pip/PipContentOverlay.java",

        "src/com/android/wm/shell/startingsurface/SplashScreenExitAnimationUtils.java",

        "src/com/android/wm/shell/draganddrop/DragAndDropConstants.java",

    ],

    path: "src",

}

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropConstants.java

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.wm.shell.draganddrop;



/** Constants that can be used by both Shell and other users of the library, e.g. Launcher */

public class DragAndDropConstants {



    /**

     * An Intent extra that Launcher can use to specify a region of the screen where Shell should

     * ignore drag events.

     */

    public static final String EXTRA_DISALLOW_HIT_REGION = "DISALLOW_HIT_REGION";

}

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropPolicy.java

+12 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import static android.content.Intent.EXTRA_USER; 
import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT;

import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT;

import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED;

import static com.android.wm.shell.draganddrop.DragAndDropConstants.EXTRA_DISALLOW_HIT_REGION;

import static com.android.wm.shell.draganddrop.DragAndDropPolicy.Target.TYPE_FULLSCREEN;

import static com.android.wm.shell.draganddrop.DragAndDropPolicy.Target.TYPE_SPLIT_BOTTOM;

import static com.android.wm.shell.draganddrop.DragAndDropPolicy.Target.TYPE_SPLIT_LEFT;
@@ -53,6 +54,7 @@ import android.content.pm.ActivityInfo; 
import android.content.pm.LauncherApps;

import android.graphics.Insets;

import android.graphics.Rect;

import android.graphics.RectF;

import android.os.Bundle;

import android.os.RemoteException;

import android.os.UserHandle;
@@ -86,6 +88,7 @@ public class DragAndDropPolicy { 
    private final Starter mStarter;

    private final SplitScreenController mSplitScreen;

    private final ArrayList<DragAndDropPolicy.Target> mTargets = new ArrayList<>();

    private final RectF mDisallowHitRegion = new RectF();



    private InstanceId mLoggerSessionId;

    private DragSession mSession;
@@ -111,6 +114,12 @@ public class DragAndDropPolicy { 
        mSession = new DragSession(mActivityTaskManager, displayLayout, data);

        // TODO(b/169894807): Also update the session data with task stack changes

        mSession.update();

        RectF disallowHitRegion = (RectF) mSession.dragData.getExtra(EXTRA_DISALLOW_HIT_REGION);

        if (disallowHitRegion == null) {

            mDisallowHitRegion.setEmpty();

        } else {

            mDisallowHitRegion.set(disallowHitRegion);

        }

    }



    /**
@@ -218,6 +227,9 @@ public class DragAndDropPolicy { 
     */

    @Nullable

    Target getTargetAtLocation(int x, int y) {

        if (mDisallowHitRegion.contains(x, y)) {

            return null;

        }

        for (int i = mTargets.size() - 1; i >= 0; i--) {

            DragAndDropPolicy.Target t = mTargets.get(i);

            if (t.hitRegion.contains(x, y)) {

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public class DragLayout extends LinearLayout { 


    @Override

    public WindowInsets onApplyWindowInsets(WindowInsets insets) {

        mInsets = insets.getInsets(Type.systemBars() | Type.displayCutout());

        mInsets = insets.getInsets(Type.tappableElement() | Type.displayCutout());

        recomputeDropTargets();



        final int orientation = getResources().getConfiguration().orientation;