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

Commit 19250d69 authored by Saumya Prakash's avatar Saumya Prakash Committed by Android (Google) Code Review
Browse files

Revert "Removed disabled overview actions at end of scroll" 

This reverts commit 96cad794.

Reason for revert: Breaks build test_suites_x86_64_coverage (linux) build 9222442 in git_tm-qpr-dev. 

Change-Id: I482f526da169505cf5d3f42ef999303dcc162a1f
parent 96cad794

quickstep/src/com/android/quickstep/views/ClearAllButton.java

+0 −4
Original line number Diff line number Diff line
@@ -99,10 +99,6 @@ public class ClearAllButton extends Button { 
        return false;

    }



    public float getScrollAlpha() {

        return mScrollAlpha;

    }



    public void setContentAlpha(float alpha) {

        if (mContentAlpha != alpha) {

            mContentAlpha = alpha;

quickstep/src/com/android/quickstep/views/OverviewActionsView.java

+1 −7
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo 
    private static final int INDEX_FULLSCREEN_ALPHA = 2;

    private static final int INDEX_HIDDEN_FLAGS_ALPHA = 3;

    private static final int INDEX_SHARE_TARGET_ALPHA = 4;

    private static final int INDEX_SCROLL_ALPHA = 5;

    private static final int NUM_ALPHAS = 6;



    public @interface SplitButtonHiddenFlags { }

    public static final int FLAG_IS_NOT_TABLET = 1 << 0;
@@ -127,7 +125,7 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo 
    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();

        mMultiValueAlpha = new MultiValueAlpha(findViewById(R.id.action_buttons), NUM_ALPHAS);

        mMultiValueAlpha = new MultiValueAlpha(findViewById(R.id.action_buttons), 5);

        mMultiValueAlpha.setUpdateVisibility(true);



        findViewById(R.id.action_screenshot).setOnClickListener(this);
@@ -249,10 +247,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo 
        return mMultiValueAlpha.getProperty(INDEX_SHARE_TARGET_ALPHA);

    }



    public AlphaProperty getIndexScrollAlpha() {

        return mMultiValueAlpha.getProperty(INDEX_SCROLL_ALPHA);

    }



    /**

     * Offsets OverviewActionsView horizontal position based on 3 button nav container in taskbar.

     */

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

+0 −3
Original line number Diff line number Diff line
@@ -1890,9 +1890,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        }

        int scroll = mOrientationHandler.getPrimaryScroll(this);

        mClearAllButton.onRecentsViewScroll(scroll, mOverviewGridEnabled);



        // Clear all button alpha was set by the previous line.

        mActionsView.getIndexScrollAlpha().setValue(1 - mClearAllButton.getScrollAlpha());

    }



    @Override

tests/tapl/com/android/launcher3/tapl/BaseOverview.java

+18 −14
Original line number Diff line number Diff line
@@ -244,36 +244,40 @@ public class BaseOverview extends LauncherInstrumentation.VisibleContainer { 
     * Returns if clear all button is visible.

     */

    public boolean isClearAllVisible() {

        return verifyActiveContainer().hasObject(

                mLauncher.getOverviewObjectSelector("clear_all"));

        return mLauncher.hasLauncherObject(mLauncher.getOverviewObjectSelector("clear_all"));

    }



    protected boolean isActionsViewVisible() {

        if (!hasTasks() || isClearAllVisible()) {

            return false;

        }

        OverviewTask task = mLauncher.isTablet() ? getFocusedTaskForTablet() : getCurrentTask();

        if (task == null) {

            return false;

        }

        // In tablets, if focused task is not in center, overview actions aren't visible.

        if (mLauncher.isTablet()

                && Math.abs(task.getExactCenterX() - mLauncher.getExactScreenCenterX()) >= 1) {

            return false;

        }

        // Overview actions aren't visible for split screen tasks.

        return !task.isTaskSplit();

    }



    private void verifyActionsViewVisibility() {

        if (!hasTasks() || !isActionsViewVisible()) {

            return;

        }

        try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(

                "want to assert overview actions view visibility")) {

            if (isActionsViewVisible()) {

                mLauncher.waitForOverviewObject("action_buttons");

            } else {

            if (mLauncher.isTablet() && !isOverviewSnappedToFocusedTaskForTablet()) {

                mLauncher.waitUntilOverviewObjectGone("action_buttons");

            } else {

                mLauncher.waitForOverviewObject("action_buttons");

            }

        }

    }



    /**

     * Returns if focused task is currently snapped task in tablet grid overview.

     */

    private boolean isOverviewSnappedToFocusedTaskForTablet() {

        OverviewTask focusedTask = getFocusedTaskForTablet();

        if (focusedTask == null) {

            return false;

        }

        return Math.abs(focusedTask.getExactCenterX() - mLauncher.getExactScreenCenterX()) < 1;

    }



    /**