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

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

Merge "Removing shelf from 2-button gesture mode"

parents 6511fd5b 9b1e7737

quickstep/res/values/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -55,11 +55,9 @@ 


    <!-- Total space (start + end) between the task card and the edge of the screen

         in various configurations -->

    <dimen name="task_card_vert_space">40dp</dimen>

    <dimen name="task_card_menu_option_vertical_padding">8dp</dimen>

    <dimen name="task_card_menu_shadow_height">3dp</dimen>

    <dimen name="task_card_menu_horizontal_padding">0dp</dimen>

    <dimen name="portrait_task_card_horz_space">136dp</dimen>

    <dimen name="portrait_task_card_horz_space_big_overview">96dp</dimen>

    <dimen name="portrait_modal_task_card_horz_space">60dp</dimen>

    <dimen name="landscape_task_card_horz_space">200dp</dimen>

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

+3 −14
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON; 
import static com.android.launcher3.LauncherState.FLAG_HIDE_BACK_BUTTON;

import static com.android.launcher3.LauncherState.NORMAL;

import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;



import android.animation.AnimatorSet;
@@ -93,7 +92,7 @@ public abstract class BaseQuickstepLauncher extends Launcher 
    @Override

    public void onNavigationModeChanged(Mode newMode) {

        getDragLayer().recreateControllers();

        if (mActionsView != null && isOverviewActionsEnabled()) {

        if (mActionsView != null) {

            mActionsView.updateVerticalMargin(newMode);

        }

    }
@@ -190,18 +189,8 @@ public abstract class BaseQuickstepLauncher extends Launcher 
        SysUINavigationMode.INSTANCE.get(this).updateMode();

        mActionsView = findViewById(R.id.overview_actions_view);

        ((RecentsView) getOverviewPanel()).init(mActionsView);



        if (isOverviewActionsEnabled()) {

            // Overview is above all other launcher elements, including qsb, so move it to the top.

            getOverviewPanel().bringToFront();

            mActionsView.bringToFront();

        mActionsView.updateVerticalMargin(SysUINavigationMode.getMode(this));

    }

    }



    private boolean isOverviewActionsEnabled() {

        return removeShelfFromOverview(this);

    }



    public <T extends OverviewActionsView> T getActionsView() {

        return (T) mActionsView;
@@ -251,7 +240,7 @@ public abstract class BaseQuickstepLauncher extends Launcher 


    @Override

    public float[] getNormalOverviewScaleAndOffset() {

        return SysUINavigationMode.getMode(this) == Mode.NO_BUTTON

        return SysUINavigationMode.getMode(this).hasGestures

                ? new float[] {1, 1} : new float[] {1.1f, 0};

    }

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+17 −25
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import static com.android.launcher3.testing.TestProtocol.HINT_STATE_ORDINAL; 
import static com.android.launcher3.testing.TestProtocol.OVERVIEW_STATE_ORDINAL;

import static com.android.launcher3.testing.TestProtocol.QUICK_SWITCH_STATE_ORDINAL;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;



import android.content.Intent;
@@ -43,7 +42,6 @@ import com.android.launcher3.Launcher; 
import com.android.launcher3.LauncherSettings.Favorites;

import com.android.launcher3.LauncherState;

import com.android.launcher3.Workspace;

import com.android.launcher3.allapps.DiscoveryBounce;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.appprediction.PredictionRowView;

import com.android.launcher3.config.FeatureFlags;
@@ -55,16 +53,15 @@ import com.android.launcher3.model.data.ItemInfo; 
import com.android.launcher3.popup.SystemShortcut;

import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;

import com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory;

import com.android.launcher3.uioverrides.touchcontrollers.LandscapeEdgeSwipeController;

import com.android.launcher3.uioverrides.touchcontrollers.NavBarToHomeTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.NoButtonNavbarToOverviewTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.NoButtonQuickSwitchTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.OverviewToAllAppsTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.PortraitStatesTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.QuickSwitchTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.StatusBarTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.TransposedQuickSwitchTouchController;

import com.android.launcher3.uioverrides.touchcontrollers.TwoButtonNavbarToOverviewTouchController;

import com.android.launcher3.util.OnboardingPrefs;

import com.android.launcher3.util.TouchController;

import com.android.launcher3.util.UiThreadHelper;
@@ -240,9 +237,6 @@ public class QuickstepLauncher extends BaseQuickstepLauncher { 
                break;

            }

            case OVERVIEW_STATE_ORDINAL: {

                RecentsView recentsView = getOverviewPanel();

                DiscoveryBounce.showForOverviewIfNeeded(this,

                        recentsView.getPagedOrientationHandler());

                RecentsView rv = getOverviewPanel();

                sendCustomAccessibilityEvent(

                        rv.getPageAt(rv.getCurrentPage()), TYPE_VIEW_FOCUSED, null);
@@ -275,24 +269,22 @@ public class QuickstepLauncher extends BaseQuickstepLauncher { 


        ArrayList<TouchController> list = new ArrayList<>();

        list.add(getDragController());

        if (mode == NO_BUTTON) {

        switch (mode) {

            case NO_BUTTON:

                list.add(new NoButtonQuickSwitchTouchController(this));

                list.add(new NavBarToHomeTouchController(this));

                list.add(new NoButtonNavbarToOverviewTouchController(this));

        } else {

            if (getDeviceProfile().isVerticalBarLayout()) {

                list.add(new OverviewToAllAppsTouchController(this));

                list.add(new LandscapeEdgeSwipeController(this));

                if (mode.hasGestures) {

                    list.add(new TransposedQuickSwitchTouchController(this));

                }

            } else {

                list.add(new PortraitStatesTouchController(this,

                        mode.hasGestures /* allowDragToOverview */));

                if (mode.hasGestures) {

                    list.add(new QuickSwitchTouchController(this));

                }

            }

                break;

            case TWO_BUTTONS:

                list.add(new TwoButtonNavbarToOverviewTouchController(this));

                list.add(getDeviceProfile().isVerticalBarLayout()

                        ? new TransposedQuickSwitchTouchController(this)

                        : new QuickSwitchTouchController(this));

                list.add(new PortraitStatesTouchController(this));

                break;

            case THREE_BUTTONS:

            default:

                list.add(new PortraitStatesTouchController(this));

        }



        if (!getDeviceProfile().isMultiWindowMode) {

quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java

+1 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ package com.android.launcher3.uioverrides.states; 


import static com.android.launcher3.anim.Interpolators.DEACCEL_2;

import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_ALLAPPS;

import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;



import android.content.Context;
@@ -84,8 +83,7 @@ public class AllAppsState extends LauncherState { 


    @Override

    public float[] getOverviewScaleAndOffset(Launcher launcher) {

        float offset = removeShelfFromOverview(launcher) ? 1 : 0;

        return new float[] {0.9f, offset};

        return new float[] {0.9f, 1};

    }



    @Override

quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java

+2 −29
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.launcher3.uioverrides.states; 
import static com.android.launcher3.anim.Interpolators.DEACCEL_2;

import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;

import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;

import static com.android.quickstep.SysUINavigationMode.hideShelfInTwoButtonLandscape;

import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;



import android.content.Context;

import android.graphics.Rect;
@@ -105,7 +103,7 @@ public class OverviewState extends LauncherState { 


    @Override

    public ScaleAndTranslation getQsbScaleAndTranslation(Launcher launcher) {

        if (this == OVERVIEW && removeShelfFromOverview(launcher)) {

        if (this == OVERVIEW) {

            // Treat the QSB as part of the hotseat so they move together.

            return getHotseatScaleAndTranslation(launcher);

        }
@@ -124,18 +122,7 @@ public class OverviewState extends LauncherState { 


    @Override

    public int getVisibleElements(Launcher launcher) {

        RecentsView recentsView = launcher.getOverviewPanel();

        if (removeShelfFromOverview(launcher) ||

                hideShelfInTwoButtonLandscape(launcher, recentsView.getPagedOrientationHandler())) {

        return OVERVIEW_BUTTONS;

        } else if (launcher.getDeviceProfile().isVerticalBarLayout()) {

            return VERTICAL_SWIPE_INDICATOR | OVERVIEW_BUTTONS;

        } else {

            boolean hasAllAppsHeaderExtra = launcher.getAppsView() != null

                    && launcher.getAppsView().getFloatingHeaderView().hasVisibleContent();

            return HOTSEAT_SEARCH_BOX | VERTICAL_SWIPE_INDICATOR | OVERVIEW_BUTTONS

                    | (hasAllAppsHeaderExtra ? ALL_APPS_HEADER_EXTRA : HOTSEAT_ICONS);

        }

    }



    @Override
@@ -143,20 +130,6 @@ public class OverviewState extends LauncherState { 
        return 0.5f;

    }



    @Override

    public float getVerticalProgress(Launcher launcher) {

        if ((getVisibleElements(launcher) & ALL_APPS_HEADER_EXTRA) == 0) {

            // We have no all apps content, so we're still at the fully down progress.

            return super.getVerticalProgress(launcher);

        }

        return getDefaultVerticalProgress(launcher);

    }



    public static float getDefaultVerticalProgress(Launcher launcher) {

        return 1 - (getDefaultSwipeHeight(launcher)

                / launcher.getAllAppsController().getShiftRange());

    }



    @Override

    public String getDescription(Launcher launcher) {

        return launcher.getString(R.string.accessibility_recent_apps);