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

Commit 23986e9a authored by Becky Qiu's avatar Becky Qiu
Browse files

Revert "Fix Task Icon menu behavior." 

This reverts commit 6df0148b.

Reason for revert: breaks the task icon behavior.

Change-Id: I6f654478e0ffe7827efeca1553622dad2e02c5da
parent 8984fea2

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

+1 −5
Original line number Diff line number Diff line
@@ -607,10 +607,6 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        }

    }



    public boolean isCenterPageTask() {

        return getScrollX() == getScrollForPage(getPageNearestToCenterOfScreen());

    }



    @Override

    protected void onPageBeginTransition() {

        super.onPageBeginTransition();
@@ -620,7 +616,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
    @Override

    protected void onPageEndTransition() {

        super.onPageEndTransition();

        if (isCenterPageTask()) {

        if (getScrollX() == getScrollForPage(getPageNearestToCenterOfScreen())) {

            LayoutUtils.setViewEnabled(mActionsView, true);

        }

        if (getNextPage() > 0) {

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

+7 −10
Original line number Diff line number Diff line
@@ -425,9 +425,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
    }



    private boolean showTaskMenu(int action) {

        if (!getRecentsView().isCenterPageTask()) {

        getRecentsView().snapToPage(getRecentsView().indexOfChild(this));

        } else {

        mMenuView = TaskMenuView.showForTask(this);

        mActivity.getStatsLogManager().log(LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS, buildProto());

        UserEventDispatcher.newInstance(getContext()).logActionOnItem(action, Direction.NONE,
@@ -435,7 +433,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
        if (mMenuView != null) {

            mMenuView.addOnAttachStateChangeListener(mTaskMenuStateListener);

        }

        }

        return mMenuView != null;

    }