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

Commit a8dae26d authored by Schneider Victor-tulias's avatar Schneider Victor-tulias
Browse files

Fix taskbar icon dragging issues 

- Fixed icons disappearing when initiating dragging
- Fixed incorrect icon location when initiating dragging after rotating the screen to an orientation other than what launcher started in

Fixes: 215418478
Fixes: 214025075
Fixes: 210460544
Test: dragged icons from the workspace and taskbar
Change-Id: I848138af28802f7d806708c77c25b8de307c70d8
(cherry picked from commit 312b68fd)
Merged-In: I848138af28802f7d806708c77c25b8de307c70d8
parent b2e30bd4

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+16 −5
Original line number Diff line number Diff line
@@ -90,11 +90,12 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 


    private static final String WINDOW_TITLE = "Taskbar";



    private final DeviceProfile mDeviceProfile;

    private final LayoutInflater mLayoutInflater;

    private final TaskbarDragLayer mDragLayer;

    private final TaskbarControllers mControllers;



    private DeviceProfile mDeviceProfile;



    private final WindowManager mWindowManager;

    private final @Nullable RoundedCorner mLeftCorner, mRightCorner;

    private final int mTaskbarHeightForIme;
@@ -125,10 +126,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 
                Settings.Secure.getUriFor(Settings.Secure.USER_SETUP_COMPLETE), 0);



        final Resources resources = getResources();

        float taskbarIconSize = resources.getDimension(R.dimen.taskbar_icon_size);

        mDeviceProfile.updateIconSize(1, resources);

        float iconScale = taskbarIconSize / mDeviceProfile.iconSizePx;

        mDeviceProfile.updateIconSize(iconScale, resources);

        updateIconSize(resources);



        mTaskbarHeightForIme = resources.getDimensionPixelSize(R.dimen.taskbar_ime_size);
@@ -211,6 +209,19 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 
        mWindowManager.addView(mDragLayer, mWindowLayoutParams);

    }



    /** Updates the Device profile instance to the latest representation of the screen. */

    public void updateDeviceProfile(DeviceProfile dp) {

        mDeviceProfile = dp;

        updateIconSize(getResources());

    }



    private void updateIconSize(Resources resources) {

        float taskbarIconSize = resources.getDimension(R.dimen.taskbar_icon_size);

        mDeviceProfile.updateIconSize(1, resources);

        float iconScale = taskbarIconSize / mDeviceProfile.iconSizePx;

        mDeviceProfile.updateIconSize(iconScale, resources);

    }



    public void onConfigurationChanged(@Config int configChanges) {

        mControllers.onConfigurationChanged(configChanges);

    }

quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ public class TaskbarDragController extends DragController<TaskbarActivityContext 
            PopupContainerWithArrow<TaskbarActivityContext> popupContainer =

                    mControllers.taskbarPopupController.showForIcon(btv);

            if (popupContainer != null) {

                dragOptions.preDragCondition = popupContainer.createPreDragCondition();

                dragOptions.preDragCondition = popupContainer.createPreDragCondition(false);

            }

        }

quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java

+7 −0
Original line number Diff line number Diff line
@@ -110,6 +110,13 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen 
                } else {

                    // Config change might be handled without re-creating the taskbar

                    if (mTaskbarActivityContext != null) {

                        DeviceProfile dp = mUserUnlocked

                                ? LauncherAppState.getIDP(mContext).getDeviceProfile(mContext)

                                : null;



                        if (dp != null && dp.isTaskbarPresent) {

                            mTaskbarActivityContext.updateDeviceProfile(dp.copy(mContext));

                        }

                        mTaskbarActivityContext.onConfigurationChanged(configDiff);

                    }

                }

src/com/android/launcher3/Workspace.java

+1 −1
Original line number Diff line number Diff line
@@ -1686,7 +1686,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
            PopupContainerWithArrow<Launcher> popupContainer = PopupContainerWithArrow

                    .showForIcon((BubbleTextView) child);

            if (popupContainer != null) {

                dragOptions.preDragCondition = popupContainer.createPreDragCondition();

                dragOptions.preDragCondition = popupContainer.createPreDragCondition(true);

            }

        }

src/com/android/launcher3/popup/PopupContainerWithArrow.java

+7 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext> 
     * Current behavior:

     * - Start the drag if the touch passes a certain distance from the original touch down.

     */

    public DragOptions.PreDragCondition createPreDragCondition() {

    public DragOptions.PreDragCondition createPreDragCondition(boolean updateIconUi) {

        return new DragOptions.PreDragCondition() {



            @Override
@@ -406,6 +406,9 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext> 


            @Override

            public void onPreDragStart(DropTarget.DragObject dragObject) {

                if (!updateIconUi) {

                    return;

                }

                if (mIsAboveIcon) {

                    // Hide only the icon, keep the text visible.

                    mOriginalIcon.setIconVisible(false);
@@ -418,6 +421,9 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext> 


            @Override

            public void onPreDragEnd(DropTarget.DragObject dragObject, boolean dragStarted) {

                if (!updateIconUi) {

                    return;

                }

                mOriginalIcon.setIconVisible(true);

                if (dragStarted) {

                    // Make sure we keep the original icon hidden while it is being dragged.