Merge "Add hold-to-drag app handle to developer options" into main (e5834251) · Commits · e / os / android_frameworks_base

core/java/android/window/DesktopModeFlags.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ public enum DesktopModeFlags {
		Flags::enableDesktopWindowingWallpaperActivity, true),
		ENABLE_DESKTOP_WINDOWING_MODALS_POLICY(Flags::enableDesktopWindowingModalsPolicy, true),
		ENABLE_THEMED_APP_HEADERS(Flags::enableThemedAppHeaders, true),
		ENABLE_HOLD_TO_DRAG_APP_HANDLE(Flags::enableHoldToDragAppHandle, true),
		ENABLE_DESKTOP_WINDOWING_QUICK_SWITCH(Flags::enableDesktopWindowingQuickSwitch, true),
		ENABLE_APP_HEADER_WITH_TASK_DENSITY(Flags::enableAppHeaderWithTaskDensity, true),
		ENABLE_TASK_STACK_OBSERVER_IN_SHELL(Flags::enableTaskStackObserverInShell, true),

+2 −1

Original line number	Diff line number	Diff line
		@@ -782,7 +782,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel,
		mTaskToken = taskInfo.token;
		mDragPositioningCallback = dragPositioningCallback;
		final int touchSlop = ViewConfiguration.get(mContext).getScaledTouchSlop();
		final long appHandleHoldToDragDuration = Flags.enableHoldToDragAppHandle()
		final long appHandleHoldToDragDuration =
		DesktopModeFlags.ENABLE_HOLD_TO_DRAG_APP_HANDLE.isTrue()
		? APP_HANDLE_HOLD_TO_DRAG_DURATION_MS : 0;
		mHandleDragDetector = new DragDetector(this, appHandleHoldToDragDuration,
		touchSlop);

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.tools.traces.parsers.WindowManagerStateHelper
		import android.tools.traces.wm.WindowingMode
		import android.view.WindowInsets
		import android.view.WindowManager
		import android.window.DesktopModeFlags
		import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
		import androidx.test.uiautomator.By
		import androidx.test.uiautomator.BySelector
		@@ -35,7 +36,6 @@ import androidx.test.uiautomator.UiDevice
		import androidx.test.uiautomator.UiObject2
		import androidx.test.uiautomator.Until
		import com.android.server.wm.flicker.helpers.MotionEventHelper.InputMethod.TOUCH
		import com.android.window.flags.Flags
		import java.time.Duration

		/**
		@@ -107,7 +107,7 @@ open class DesktopModeAppHelper(private val innerHelper: IStandardAppHelper) :

		// drag the window to move to desktop
		if (motionEventHelper.inputMethod == TOUCH
		&& Flags.enableHoldToDragAppHandle()) {
		&& DesktopModeFlags.ENABLE_HOLD_TO_DRAG_APP_HANDLE.isTrue) {
		// Touch requires hold-to-drag.
		motionEventHelper.holdToDrag(startX, startY, startX, endY, steps = 100)
		} else {