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

Commit 075c73aa authored by Nergi Rahardi's avatar Nergi Rahardi Committed by Android (Google) Code Review
Browse files

Merge "[DnD] Update DocsUI to pass displayId for DragEvent" into main

parents ff0f9304 ee2a2177
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -546,8 +546,8 @@ public class ActionHandlerTest {
    public void testDragAndDrop_OnReadOnlyRoot() throws Exception {
        assumeTrue(VersionUtils.isAtLeastS());
        RootInfo root = new RootInfo(); // root by default has no SUPPORT_CREATE flag
        DragEvent event = DragEvent.obtain(DragEvent.ACTION_DROP, 1, 1, 0, 0, 0, null, null, null,
                null, null, true);
        DragEvent event = DragEvent.obtain(DragEvent.ACTION_DROP, 1, 1, 0, 0, 0, 0, null, null,
                null, null, null, true);
        assertFalse(mHandler.dropOn(event, root));
    }

@@ -558,8 +558,8 @@ public class ActionHandlerTest {
    @Test
    public void testDragAndDrop_OnLibraryRoot() throws Exception {
        assumeTrue(VersionUtils.isAtLeastS());
        DragEvent event = DragEvent.obtain(DragEvent.ACTION_DROP, 1, 1, 0, 0, 0, null, null, null,
                null, null, true);
        DragEvent event = DragEvent.obtain(DragEvent.ACTION_DROP, 1, 1, 0, 0, 0, 0, null, null,
                null, null, null, true);
        assertFalse(mHandler.dropOn(event, TestProvidersAccess.RECENTS));
    }

@@ -575,8 +575,8 @@ public class ActionHandlerTest {
        // our Clipper is getting the original CipData passed in.
        Object localState = new Object();
        ClipData clipData = ClipDatas.createTestClipData();
        DragEvent event = DragEvent.obtain(DragEvent.ACTION_DROP, 1, 1, 0, 0, 0, localState, null,
                clipData, null, null, true);
        DragEvent event = DragEvent.obtain(DragEvent.ACTION_DROP, 1, 1, 0, 0, 0, 0, localState,
                null, clipData, null, null, true);

        mHandler.dropOn(event, TestProvidersAccess.DOWNLOADS);
        event.recycle();