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

Commit 126ac141 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Introducing CellPosMapper which allows mapping between UI position and... 

Merge "Introducing CellPosMapper which allows mapping between UI position and model position" into tm-qpr-dev
parents 6e21d310 669b71f5

quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ public class HotseatEduDialog extends AbstractSlideInView<Launcher> implements I 
            icon.setEnabled(false);

            icon.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);

            icon.verifyHighRes();

            CellLayoutLayoutParams lp = new CellLayoutLayoutParams(i, 0, 1, 1, -1);

            CellLayoutLayoutParams lp = new CellLayoutLayoutParams(i, 0, 1, 1);

            mSampleHotseat.addViewToCellLayout(icon, i, info.getViewId(), lp, true);

        }

    }

src/com/android/launcher3/AppWidgetResizeFrame.java

+6 −4
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import androidx.annotation.Px; 


import com.android.launcher3.accessibility.DragViewStateAnnouncer;

import com.android.launcher3.celllayout.CellLayoutLayoutParams;

import com.android.launcher3.celllayout.CellPosMapper.CellPos;

import com.android.launcher3.dragndrop.DragLayer;

import com.android.launcher3.keyboard.ViewGroupFocusHelper;

import com.android.launcher3.logging.InstanceId;
@@ -268,10 +269,11 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O 


        CellLayoutLayoutParams lp = (CellLayoutLayoutParams) mWidgetView.getLayoutParams();

        ItemInfo widgetInfo = (ItemInfo) mWidgetView.getTag();

        lp.setCellX(widgetInfo.cellX);

        lp.setTmpCellX(widgetInfo.cellX);

        lp.setCellY(widgetInfo.cellY);

        lp.setTmpCellY(widgetInfo.cellY);

        CellPos presenterPos = mLauncher.getCellPosMapper().mapModelToPresenter(widgetInfo);

        lp.setCellX(presenterPos.cellX);

        lp.setTmpCellX(presenterPos.cellX);

        lp.setCellY(presenterPos.cellY);

        lp.setTmpCellY(presenterPos.cellY);

        lp.cellHSpan = widgetInfo.spanX;

        lp.cellVSpan = widgetInfo.spanY;

        lp.isLockedToGrid = true;

src/com/android/launcher3/CellLayout.java

+17 −18
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import com.android.launcher3.LauncherSettings.Favorites; 
import com.android.launcher3.accessibility.DragAndDropAccessibilityDelegate;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.celllayout.CellLayoutLayoutParams;

import com.android.launcher3.celllayout.CellPosMapper.CellPos;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.dragndrop.DraggableView;

import com.android.launcher3.folder.PreviewBackground;
@@ -267,7 +268,7 @@ public class CellLayout extends ViewGroup { 
        mDragCell[0] = mDragCell[1] = -1;

        mDragCellSpan[0] = mDragCellSpan[1] = -1;

        for (int i = 0; i < mDragOutlines.length; i++) {

            mDragOutlines[i] = new CellLayoutLayoutParams(0, 0, 0, 0, -1);

            mDragOutlines[i] = new CellLayoutLayoutParams(0, 0, 0, 0);

        }

        mDragOutlinePaint.setColor(Themes.getAttrColor(context, R.attr.workspaceTextColor));
@@ -1084,8 +1085,8 @@ public class CellLayout extends ViewGroup { 
            final int oldY = lp.y;

            lp.isLockedToGrid = true;

            if (permanent) {

                lp.setCellX(info.cellX = cellX);

                lp.setCellY(info.cellY = cellY);

                lp.setCellX(cellX);

                lp.setCellY(cellY);

            } else {

                lp.setTmpCellX(cellX);

                lp.setTmpCellY(cellY);
@@ -1627,20 +1628,16 @@ public class CellLayout extends ViewGroup { 
            // We do a null check here because the item info can be null in the case of the

            // AllApps button in the hotseat.

            if (info != null && child != dragView) {

                final boolean requiresDbUpdate = (info.cellX != lp.getTmpCellX()

                        || info.cellY != lp.getTmpCellY() || info.spanX != lp.cellHSpan

                        || info.spanY != lp.cellVSpan);

                CellPos presenterPos = mActivity.getCellPosMapper().mapModelToPresenter(info);

                final boolean requiresDbUpdate = (presenterPos.cellX != lp.getTmpCellX()

                        || presenterPos.cellY != lp.getTmpCellY() || info.spanX != lp.cellHSpan

                        || info.spanY != lp.cellVSpan || presenterPos.screenId != screenId);



                lp.setCellX(lp.getTmpCellX());

                info.cellX = lp.getTmpCellX();

                info.cellY = lp.getTmpCellY();

                lp.setCellY(lp.getTmpCellY());

                info.spanX = lp.cellHSpan;

                info.spanY = lp.cellVSpan;



                if (requiresDbUpdate) {

                    Launcher.cast(mActivity).getModelWriter().modifyItemInDatabase(info, container,

                            screenId, info.cellX, info.cellY, info.spanX, info.spanY);

                            screenId, lp.getCellX(), lp.getCellY(), lp.cellHSpan, lp.cellVSpan);

                }

            }

        }
@@ -2792,7 +2789,8 @@ public class CellLayout extends ViewGroup { 
        if (view instanceof LauncherAppWidgetHostView

                && view.getTag() instanceof LauncherAppWidgetInfo) {

            LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) view.getTag();

            mOccupied.markCells(info.cellX, info.cellY, info.spanX, info.spanY, true);

            CellPos pos = mActivity.getCellPosMapper().mapModelToPresenter(info);

            mOccupied.markCells(pos.cellX, pos.cellY, info.spanX, info.spanY, true);

            return;

        }

        if (view == null || view.getParent() != mShortcutsAndWidgets) return;
@@ -2805,7 +2803,8 @@ public class CellLayout extends ViewGroup { 
        if (view instanceof LauncherAppWidgetHostView

                && view.getTag() instanceof LauncherAppWidgetInfo) {

            LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) view.getTag();

            mOccupied.markCells(info.cellX, info.cellY, info.spanX, info.spanY, false);

            CellPos pos = mActivity.getCellPosMapper().mapModelToPresenter(info);

            mOccupied.markCells(pos.cellX, pos.cellY, info.spanX, info.spanY, false);

            return;

        }

        if (view == null || view.getParent() != mShortcutsAndWidgets) return;
@@ -2858,13 +2857,13 @@ public class CellLayout extends ViewGroup { 
        final int screenId;

        final int container;



        public CellInfo(View v, ItemInfo info) {

            cellX = info.cellX;

            cellY = info.cellY;

        public CellInfo(View v, ItemInfo info, CellPos cellPos) {

            cellX = cellPos.cellX;

            cellY = cellPos.cellY;

            spanX = info.spanX;

            spanY = info.spanY;

            cell = v;

            screenId = info.screenId;

            screenId = cellPos.screenId;

            container = info.container;

        }

src/com/android/launcher3/Launcher.java

+50 −25
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import static com.android.launcher3.LauncherAnimUtils.HOTSEAT_SCALE_PROPERTY_FAC 
import static com.android.launcher3.LauncherAnimUtils.SCALE_INDEX_WIDGET_TRANSITION;

import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;

import static com.android.launcher3.LauncherAnimUtils.WORKSPACE_SCALE_PROPERTY_FACTORY;

import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP;

import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;

import static com.android.launcher3.LauncherState.ALL_APPS;

import static com.android.launcher3.LauncherState.FLAG_MULTI_PAGE;
@@ -135,6 +136,8 @@ import com.android.launcher3.allapps.AllAppsTransitionController; 
import com.android.launcher3.allapps.BaseSearchConfig;

import com.android.launcher3.allapps.DiscoveryBounce;

import com.android.launcher3.anim.PropertyListBuilder;

import com.android.launcher3.celllayout.CellPosMapper;

import com.android.launcher3.celllayout.CellPosMapper.CellPos;

import com.android.launcher3.compat.AccessibilityManagerCompat;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.dot.DotInfo;
@@ -406,6 +409,8 @@ public class Launcher extends StatefulActivity<LauncherState> 
    private StringCache mStringCache;

    private BaseSearchConfig mBaseSearchConfig;



    private CellPosMapper mCellPosMapper = CellPosMapper.DEFAULT;



    @Override

    @TargetApi(Build.VERSION_CODES.S)

    protected void onCreate(Bundle savedInstanceState) {
@@ -725,10 +730,17 @@ public class Launcher extends StatefulActivity<LauncherState> 
        }



        onDeviceProfileInitiated();

        mModelWriter = mModel.getWriter(getDeviceProfile().isVerticalBarLayout(), true, this);

        mCellPosMapper = CellPosMapper.DEFAULT;

        mModelWriter = mModel.getWriter(getDeviceProfile().isVerticalBarLayout(), true,

                mCellPosMapper, this);

        return true;

    }



    @Override

    public CellPosMapper getCellPosMapper() {

        return mCellPosMapper;

    }



    public RotationHelper getRotationHelper() {

        return mRotationHelper;

    }
@@ -794,16 +806,18 @@ public class Launcher extends StatefulActivity<LauncherState> 
     */

    private int completeAdd(

            int requestCode, Intent intent, int appWidgetId, PendingRequestArgs info) {

        int screenId = info.screenId;

        if (info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {

        CellPos cellPos = getCellPosMapper().mapModelToPresenter(info);

        int screenId = cellPos.screenId;

        if (info.container == CONTAINER_DESKTOP) {

            // When the screen id represents an actual screen (as opposed to a rank) we make sure

            // that the drop page actually exists.

            screenId = ensurePendingDropLayoutExists(info.screenId);

            screenId = ensurePendingDropLayoutExists(cellPos.screenId);

        }



        switch (requestCode) {

            case REQUEST_CREATE_SHORTCUT:

                completeAddShortcut(intent, info.container, screenId, info.cellX, info.cellY, info);

                completeAddShortcut(intent, info.container, screenId,

                        cellPos.cellX, cellPos.cellY, info);

                announceForAccessibility(R.string.item_added_to_workspace);

                break;

            case REQUEST_CREATE_APPWIDGET:
@@ -899,14 +913,17 @@ public class Launcher extends StatefulActivity<LauncherState> 
                        ON_ACTIVITY_RESULT_ANIMATION_DELAY, false,

                        () -> getStateManager().goToState(NORMAL));

            } else {

                if (requestArgs.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {

                CellPos presenterPos = getCellPosMapper().mapModelToPresenter(requestArgs);

                if (requestArgs.container == CONTAINER_DESKTOP) {

                    // When the screen id represents an actual screen (as opposed to a rank)

                    // we make sure that the drop page actually exists.

                    requestArgs.screenId =

                            ensurePendingDropLayoutExists(requestArgs.screenId);

                    int newScreenId = ensurePendingDropLayoutExists(presenterPos.screenId);

                    requestArgs.screenId = getCellPosMapper().mapPresenterToModel(

                            presenterPos.cellX, presenterPos.cellY, newScreenId, CONTAINER_DESKTOP)

                                    .screenId;

                }

                final CellLayout dropLayout =

                        mWorkspace.getScreenWithId(requestArgs.screenId);

                        mWorkspace.getScreenWithId(presenterPos.screenId);



                dropLayout.setDropPending(true);

                final Runnable onComplete = new Runnable() {
@@ -964,9 +981,10 @@ public class Launcher extends StatefulActivity<LauncherState> 
            setWaitingForResult(null);



            View v = null;

            CellLayout layout = getCellLayout(pendingArgs.container, pendingArgs.screenId);

            CellPos cellPos = getCellPosMapper().mapModelToPresenter(pendingArgs);

            CellLayout layout = getCellLayout(pendingArgs.container, cellPos.screenId);

            if (layout != null) {

                v = layout.getChildAt(pendingArgs.cellX, pendingArgs.cellY);

                v = layout.getChildAt(cellPos.cellX, cellPos.cellY);

            }

            Intent intent = pendingArgs.getPendingIntent();
@@ -1002,7 +1020,8 @@ public class Launcher extends StatefulActivity<LauncherState> 
    @Thunk

    void completeTwoStageWidgetDrop(

            final int resultCode, final int appWidgetId, final PendingRequestArgs requestArgs) {

        CellLayout cellLayout = mWorkspace.getScreenWithId(requestArgs.screenId);

        CellLayout cellLayout = mWorkspace.getScreenWithId(

                getCellPosMapper().mapModelToPresenter(requestArgs).screenId);

        Runnable onCompleteRunnable = null;

        int animationType = 0;
@@ -1493,9 +1512,9 @@ public class Launcher extends StatefulActivity<LauncherState> 
            launcherInfo.sourceContainer =

                    ((PendingRequestArgs) itemInfo).getWidgetSourceContainer();

        }



        CellPos presenterPos = getCellPosMapper().mapModelToPresenter(itemInfo);

        getModelWriter().addItemToDatabase(launcherInfo,

                itemInfo.container, itemInfo.screenId, itemInfo.cellX, itemInfo.cellY);

                itemInfo.container, presenterPos.screenId, presenterPos.cellX, presenterPos.cellY);



        hostView.setVisibility(View.VISIBLE);

        prepareAppWidget(hostView, launcherInfo);
@@ -1505,7 +1524,7 @@ public class Launcher extends StatefulActivity<LauncherState> 
        // Show the widget resize frame.

        if (hostView instanceof LauncherAppWidgetHostView) {

            final LauncherAppWidgetHostView launcherHostView = (LauncherAppWidgetHostView) hostView;

            CellLayout cellLayout = getCellLayout(launcherInfo.container, launcherInfo.screenId);

            CellLayout cellLayout = getCellLayout(launcherInfo.container, presenterPos.screenId);

            if (mStateManager.getState() == NORMAL) {

                AppWidgetResizeFrame.showForWidget(launcherHostView, cellLayout);

            } else {
@@ -1887,12 +1906,17 @@ public class Launcher extends StatefulActivity<LauncherState> 


    public void addPendingItem(PendingAddItemInfo info, int container, int screenId,

            int[] cell, int spanX, int spanY) {

        info.container = container;

        info.screenId = screenId;

        if (cell != null) {

            info.cellX = cell[0];

            info.cellY = cell[1];

        if (cell == null) {

            CellPos modelPos = getCellPosMapper().mapPresenterToModel(0, 0, screenId, container);

            info.screenId = modelPos.screenId;

        } else {

            CellPos modelPos = getCellPosMapper().mapPresenterToModel(

                    cell[0],  cell[1], screenId, container);

            info.screenId = modelPos.screenId;

            info.cellX = modelPos.cellX;

            info.cellY = modelPos.cellY;

        }

        info.container = container;

        info.spanX = spanX;

        info.spanY = spanY;
@@ -2455,10 +2479,11 @@ public class Launcher extends StatefulActivity<LauncherState> 
            /*

             * Remove colliding items.

             */

            if (item.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {

                CellLayout cl = mWorkspace.getScreenWithId(item.screenId);

                if (cl != null && cl.isOccupied(item.cellX, item.cellY)) {

                    View v = cl.getChildAt(item.cellX, item.cellY);

            CellPos presenterPos = getCellPosMapper().mapModelToPresenter(item);

            if (item.container == CONTAINER_DESKTOP) {

                CellLayout cl = mWorkspace.getScreenWithId(presenterPos.screenId);

                if (cl != null && cl.isOccupied(presenterPos.cellX, presenterPos.cellY)) {

                    View v = cl.getChildAt(presenterPos.cellX, presenterPos.cellY);

                    if (v == null) {

                        Log.e(TAG, "bindItems failed when removing colliding item=" + item);

                    }
@@ -2484,7 +2509,7 @@ public class Launcher extends StatefulActivity<LauncherState> 
                view.setScaleX(0f);

                view.setScaleY(0f);

                bounceAnims.add(createNewAppBounceAnimation(view, i));

                newItemsScreenId = item.screenId;

                newItemsScreenId = presenterPos.screenId;

            }



            if (newView == null) {

src/com/android/launcher3/LauncherModel.java

+3 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;

import androidx.annotation.WorkerThread;



import com.android.launcher3.celllayout.CellPosMapper;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.icons.IconCache;

import com.android.launcher3.logging.FileLog;
@@ -165,9 +166,9 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi 


    @NonNull

    public ModelWriter getWriter(final boolean hasVerticalHotseat, final boolean verifyChanges,

            @Nullable final Callbacks owner) {

            CellPosMapper cellPosMapper, @Nullable final Callbacks owner) {

        return new ModelWriter(mApp.getContext(), this, mBgDataModel,

                hasVerticalHotseat, verifyChanges, owner);

                hasVerticalHotseat, verifyChanges, cellPosMapper, owner);

    }



    @Override