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

Commit 10ad1b97 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Fixing Virtual nodes getting wrong screen bounds, when dragging in spring 

loaded mode

Bug: 29582251
Change-Id: I614d387a9b12d812ebb84c7739e8d9ae1bc057b2
parent ba162aa7

src/com/android/launcher3/accessibility/WorkspaceAccessibilityHelper.java

+26 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
package com.android.launcher3.accessibility;



import android.content.Context;

import android.graphics.Rect;

import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;

import android.text.TextUtils;

import android.view.View;
@@ -24,15 +26,20 @@ import com.android.launcher3.AppInfo; 
import com.android.launcher3.CellLayout;

import com.android.launcher3.FolderInfo;

import com.android.launcher3.ItemInfo;

import com.android.launcher3.Launcher;

import com.android.launcher3.accessibility.LauncherAccessibilityDelegate.DragType;

import com.android.launcher3.R;

import com.android.launcher3.ShortcutInfo;

import com.android.launcher3.dragndrop.DragLayer;



/**

 * Implementation of {@link DragAndDropAccessibilityDelegate} to support DnD on workspace.

 */

public class WorkspaceAccessibilityHelper extends DragAndDropAccessibilityDelegate {



    private final Rect mTempRect = new Rect();

    private final int[] mTempCords = new int[2];



    public WorkspaceAccessibilityHelper(CellLayout layout) {

        super(layout);

    }
@@ -127,6 +134,25 @@ public class WorkspaceAccessibilityHelper extends DragAndDropAccessibilityDelega 
        return "";

    }



    @Override

    protected void onPopulateNodeForVirtualView(int id, AccessibilityNodeInfoCompat node) {

        super.onPopulateNodeForVirtualView(id, node);





        // ExploreByTouchHelper does not currently handle view scale.

        // Update BoundsInScreen to appropriate value.

        DragLayer dragLayer = Launcher.getLauncher(mView.getContext()).getDragLayer();

        mTempCords[0] = mTempCords[1] = 0;

        float scale = dragLayer.getDescendantCoordRelativeToSelf(mView, mTempCords);



        node.getBoundsInParent(mTempRect);

        mTempRect.left = mTempCords[0] + (int) (mTempRect.left * scale);

        mTempRect.right = mTempCords[0] + (int) (mTempRect.right * scale);

        mTempRect.top = mTempCords[1] + (int) (mTempRect.top * scale);

        mTempRect.bottom = mTempCords[1] + (int) (mTempRect.bottom * scale);

        node.setBoundsInScreen(mTempRect);

    }



    @Override

    protected String getLocationDescriptionForIconDrop(int id) {

        int x = id % mView.getCountX();