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

Commit cc505b8a authored by Steven Ng's avatar Steven Ng
Browse files

Don't store Launcher as a class variable in CellLayout 

CellLayout can be used by non launcher context, e.g. style &
wallpaper preview. To be safe, don't store Launcher as class
variable.

Test: Preview in style & wallpaper works fine
      Drag icons from hotseat.
      Drag widgets from workspace.

Bug: b/182282587
Change-Id: I9358eebce66ff1a46adbfb0602ae2bc970a921a6
parent f7864fed

src/com/android/launcher3/CellLayout.java

+10 −11
Original line number Diff line number Diff line
@@ -181,8 +181,6 @@ public class CellLayout extends ViewGroup { 
    private final ArrayList<View> mIntersectingViews = new ArrayList<>();

    private final Rect mOccupiedRect = new Rect();

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

    private final Workspace mWorkspace;

    private final DeviceProfile mDeviceProfile;



    final int[] mPreviousReorderDirection = new int[2];

    private static final int INVALID_DIRECTION = -100;
@@ -213,15 +211,14 @@ public class CellLayout extends ViewGroup { 
        setWillNotDraw(false);

        setClipToPadding(false);

        mActivity = ActivityContext.lookupContext(context);

        mWorkspace = Launcher.cast(mActivity).getWorkspace();

        mDeviceProfile = mActivity.getDeviceProfile();

        DeviceProfile deviceProfile = mActivity.getDeviceProfile();



        mBorderSpacing = mDeviceProfile.cellLayoutBorderSpacingPx;

        mBorderSpacing = deviceProfile.cellLayoutBorderSpacingPx;

        mCellWidth = mCellHeight = -1;

        mFixedCellWidth = mFixedCellHeight = -1;



        mCountX = mDeviceProfile.inv.numColumns;

        mCountY = mDeviceProfile.inv.numRows;

        mCountX = deviceProfile.inv.numColumns;

        mCountY = deviceProfile.inv.numRows;

        mOccupied =  new GridOccupancy(mCountX, mCountY);

        mTmpOccupied = new GridOccupancy(mCountX, mCountY);
@@ -238,7 +235,7 @@ public class CellLayout extends ViewGroup { 
        mBackground.setCallback(this);

        mBackground.setAlpha(0);



        mReorderPreviewAnimationMagnitude = (REORDER_PREVIEW_MAGNITUDE * mDeviceProfile.iconSizePx);

        mReorderPreviewAnimationMagnitude = (REORDER_PREVIEW_MAGNITUDE * deviceProfile.iconSizePx);



        // Initialize the data structures used for the drag visualization.

        mEaseOutInterpolator = Interpolators.DEACCEL_2_5; // Quint ease out
@@ -1024,8 +1021,10 @@ public class CellLayout extends ViewGroup { 
        // Apply local extracted color if the DragView is an AppWidgetHostViewDrawable.

        Drawable drawable = dragObject.dragView.getDrawable();

        if (drawable instanceof AppWidgetHostViewDrawable) {

            int screenId = mWorkspace.getIdForScreen(this);

            int pageId = mWorkspace.getPageIndexForScreenId(screenId);

            Workspace workspace =

                    Launcher.getLauncher(dragObject.dragView.getContext()).getWorkspace();

            int screenId = workspace.getIdForScreen(this);

            int pageId = workspace.getPageIndexForScreenId(screenId);

            AppWidgetHostViewDrawable hostViewDrawable = ((AppWidgetHostViewDrawable) drawable);

            cellToRect(targetCell[0], targetCell[1], spanX, spanY, mTempRect);

            hostViewDrawable.getAppWidgetHostView().handleDrag(mTempRect, pageId);
@@ -2097,7 +2096,7 @@ public class CellLayout extends ViewGroup { 
    private void commitTempPlacement() {

        mTmpOccupied.copyTo(mOccupied);



        int screenId = mWorkspace.getIdForScreen(this);

        int screenId = Launcher.cast(mActivity).getWorkspace().getIdForScreen(this);

        int container = Favorites.CONTAINER_DESKTOP;



        if (mContainerType == HOTSEAT) {