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

Commit 4dfcbec5 authored by Becky Qiu's avatar Becky Qiu
Browse files

Revert "[Overview Actions] UI update for Landscape." 

This reverts commit 160ca4b8.

Reason for revert: Got issues like b/158318606 when switch nav modes, also the margin seems not set properly. And this doesn't work for 3 button mode too. Would switch to just use task menu for all.

Change-Id: I645f2a2a9032ae99799c75bcc6c983c1bbfd8df8
parent 6de126f9

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java

+6 −8
Original line number Diff line number Diff line
@@ -310,8 +310,8 @@ public final class LauncherActivityInterface extends 
    @Override

    protected float getExtraSpace(Context context, DeviceProfile dp,

            PagedOrientationHandler orientationHandler) {

        if ((dp.isVerticalBarLayout() && !showOverviewActions(context))

                || hideShelfInTwoButtonLandscape(context, orientationHandler)) {

        if (dp.isVerticalBarLayout() ||

                hideShelfInTwoButtonLandscape(context, orientationHandler)) {

            return 0;

        } else {

            Resources res = context.getResources();
@@ -319,7 +319,6 @@ public final class LauncherActivityInterface extends 
                //TODO: this needs to account for the swipe gesture height and accessibility

                // UI when shown.

                float actionsBottomMargin = 0;

                if (!dp.isVerticalBarLayout()) {

                if (getMode(context) == Mode.THREE_BUTTONS) {

                    actionsBottomMargin = res.getDimensionPixelSize(

                            R.dimen.overview_actions_bottom_margin_three_button);
@@ -327,7 +326,6 @@ public final class LauncherActivityInterface extends 
                    actionsBottomMargin = res.getDimensionPixelSize(

                            R.dimen.overview_actions_bottom_margin_gesture);

                }

                }

                float actionsHeight = actionsBottomMargin

                        + res.getDimensionPixelSize(R.dimen.overview_actions_height);

                return actionsHeight;

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

+4 −15
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_SHARE; 
import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;



import android.content.Context;

import android.content.res.Configuration;

import android.util.AttributeSet;

import android.util.Log;

import android.view.View;
@@ -34,7 +33,6 @@ import androidx.annotation.Nullable; 
import com.android.launcher3.R;

import com.android.launcher3.util.MultiValueAlpha;

import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;

import com.android.quickstep.SysUINavigationMode;

import com.android.quickstep.SysUINavigationMode.Mode;

import com.android.quickstep.TaskOverlayFactory.OverlayUICallbacks;
@@ -131,12 +129,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo 
        updateHiddenFlags(HIDDEN_UNSUPPORTED_NAVIGATION, !removeShelfFromOverview(getContext()));

    }



    @Override

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

        updateVerticalMargin(SysUINavigationMode.getMode(getContext()));

    }



    public void updateHiddenFlags(@ActionsHiddenFlags int visibilityFlags, boolean enable) {

        if (enable) {

            mHiddenFlags |= visibilityFlags;
@@ -160,13 +152,10 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo 
        return mMultiValueAlpha.getProperty(INDEX_FULLSCREEN_ALPHA);

    }



    /** Updates vertical margins for different navigation mode or configuration changes. */

    public void updateVerticalMargin(Mode mode) {

        int bottomMargin;

        int orientation = getResources().getConfiguration().orientation;

        if (orientation == Configuration.ORIENTATION_LANDSCAPE) {

            bottomMargin = 0;

        } else if (mode == Mode.THREE_BUTTONS) {

    /** Updates vertical margins for different navigation mode. */

    public void updateVerticalMarginForNavModeChange(Mode mode) {

        int bottomMargin = 0;

        if (mode == Mode.THREE_BUTTONS) {

            bottomMargin = getResources()

                    .getDimensionPixelSize(R.dimen.overview_actions_bottom_margin_three_button);

        } else {

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

+1 −3
Original line number Diff line number Diff line
@@ -1627,10 +1627,8 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
                    : View.LAYOUT_DIRECTION_RTL);

            mClearAllButton.setRotation(mOrientationHandler.getDegreesRotated());

            mActivity.getDragLayer().recreateControllers();

            boolean isInLandscape = touchRotation != 0

                    || mOrientationState.getLauncherRotation() != ROTATION_0;

            mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION,

                    !mOrientationState.canLauncherRotate() && isInLandscape);

                    touchRotation != 0 || mOrientationState.getLauncherRotation() != ROTATION_0);

            resetPaddingFromTaskSize();

            requestLayout();

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public abstract class BaseQuickstepLauncher extends Launcher 
    public void onNavigationModeChanged(Mode newMode) {

        getDragLayer().recreateControllers();

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

            mActionsView.updateVerticalMargin(newMode);

            mActionsView.updateVerticalMarginForNavModeChange(newMode);

        }

    }
@@ -175,7 +175,7 @@ public abstract class BaseQuickstepLauncher extends Launcher 
            // Overview is above all other launcher elements, including qsb, so move it to the top.

            getOverviewPanel().bringToFront();

            mActionsView.bringToFront();

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

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

        }

    }