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

Commit 4b1d1a0f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prevent showing TaskMenuView if icon isn't present" into ub-launcher3-rvc-qpr-dev

parents 94be66ac 2060a4b9

quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java

+16 −4
Original line number Diff line number Diff line
@@ -169,7 +169,9 @@ public class TaskMenuView extends AbstractFloatingView { 
        }

        if (mIsOpen) {

            mOptionLayout.removeAllViews();

            populateAndLayoutMenu();

            if (!populateAndLayoutMenu()) {

                close(false);

            }

        }

    }
@@ -186,14 +188,22 @@ public class TaskMenuView extends AbstractFloatingView { 
        }

        mActivity.getDragLayer().addView(this);

        mTaskView = taskView;

        populateAndLayoutMenu();

        if (!populateAndLayoutMenu()) {

            return false;

        }

        post(this::animateOpen);

        return true;

    }



    private void populateAndLayoutMenu() {

    /** @return true if successfully able to populate task view menu, false otherwise */

    private boolean populateAndLayoutMenu() {

        if (mTaskView.getTask().icon == null) {

            // Icon may not be loaded

            return false;

        }

        addMenuOptions(mTaskView);

        orientAroundTaskView(mTaskView);

        return true;

    }



    private void addMenuOptions(TaskView taskView) {
@@ -240,8 +250,10 @@ public class TaskMenuView extends AbstractFloatingView { 
        setLayoutParams(params);

        setScaleX(taskView.getScaleX());

        setScaleY(taskView.getScaleY());

        boolean canActivityRotate = taskView.getRecentsView()

            .mOrientationState.canRecentsActivityRotate();

        mOptionLayout.setOrientation(orientationHandler

                .getTaskMenuLayoutOrientation(mOptionLayout));

                .getTaskMenuLayoutOrientation(canActivityRotate, mOptionLayout));

        setPosition(sTempRect.left - insets.left, sTempRect.top - insets.top,

            taskView.getPagedOrientationHandler());

    }

src/com/android/launcher3/touch/LandscapePagedViewHandler.java

+2 −1
Original line number Diff line number Diff line
@@ -239,7 +239,8 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler { 
    }



    @Override

    public int getTaskMenuLayoutOrientation(LinearLayout taskMenuLayout) {

    public int getTaskMenuLayoutOrientation(boolean canRecentsActivityRotate,

        LinearLayout taskMenuLayout) {

        return LinearLayout.HORIZONTAL;

    }

src/com/android/launcher3/touch/PagedOrientationHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public interface PagedOrientationHandler { 
    float getTaskMenuX(float x, View thumbnailView);

    float getTaskMenuY(float y, View thumbnailView);

    int getTaskMenuWidth(View view);

    int getTaskMenuLayoutOrientation(LinearLayout taskMenuLayout);

    int getTaskMenuLayoutOrientation(boolean canRecentsActivityRotate, LinearLayout taskMenuLayout);

    void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp);

    int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect);

src/com/android/launcher3/touch/PortraitPagedViewHandler.java

+3 −2
Original line number Diff line number Diff line
@@ -237,8 +237,9 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { 
    }



    @Override

    public int getTaskMenuLayoutOrientation(LinearLayout taskMenuLayout) {

        return taskMenuLayout.getOrientation();

    public int getTaskMenuLayoutOrientation(boolean canRecentsActivityRotate,

        LinearLayout taskMenuLayout) {

        return canRecentsActivityRotate ? taskMenuLayout.getOrientation() : LinearLayout.VERTICAL;

    }



    @Override