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

Commit 312b68fd 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
Test: dragged icons from the workspace and taskbar
Change-Id: I848138af28802f7d806708c77c25b8de307c70d8
parent 1b077203

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

+16 −5
Original line number Diff line number Diff line
@@ -96,11 +96,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;
@@ -136,10 +137,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 
                Settings.Secure.getUriFor(Settings.Secure.NAV_BAR_KIDS_MODE), 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);
@@ -214,6 +212,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);

    }



    /** Creates LayoutParams for adding a view directly to WindowManager as a new window */

    public WindowManager.LayoutParams createDefaultWindowLayoutParams() {

        WindowManager.LayoutParams windowLayoutParams = new WindowManager.LayoutParams(

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

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,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
@@ -116,6 +116,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/config/FeatureFlags.java

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ public final class FeatureFlags { 
            "Enables showing taskbar education the first time an app is opened.");



    public static final BooleanFlag ENABLE_TASKBAR_POPUP_MENU = getDebugFlag(

            "ENABLE_TASKBAR_POPUP_MENU", false, "Enables long pressing taskbar icons to show the"

            "ENABLE_TASKBAR_POPUP_MENU", true, "Enables long pressing taskbar icons to show the"

                    + " popup menu.");



    public static final BooleanFlag ENABLE_OVERVIEW_GRID = getDebugFlag(