Merge "Revert "Hide shelf in 2-Button Landscape"" into ub-launcher3-rvc-dev (b219eeab) · Commits · e / os / android_packages_apps_Trebuchet

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		package com.android.quickstep.views;

		import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
		import static com.android.quickstep.SysUINavigationMode.getMode;
		import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;

		import android.content.Context;
		import android.util.AttributeSet;
		@@ -31,7 +31,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.TaskOverlayFactory.OverlayUICallbacks;

		import java.lang.annotation.Retention;
		@@ -119,8 +118,7 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
		protected void onAttachedToWindow() {
		super.onAttachedToWindow();
		updateHiddenFlags(HIDDEN_DISABLED_FEATURE, !ENABLE_OVERVIEW_ACTIONS.get());
		updateHiddenFlags(HIDDEN_UNSUPPORTED_NAVIGATION,
		getMode(getContext()) == SysUINavigationMode.Mode.TWO_BUTTONS);
		updateHiddenFlags(HIDDEN_UNSUPPORTED_NAVIGATION, !removeShelfFromOverview(getContext()));
		}

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

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

+1 −6

Original line number	Diff line number	Diff line
		@@ -117,7 +117,6 @@ import com.android.quickstep.RecentsAnimationController;
		import com.android.quickstep.RecentsAnimationTargets;
		import com.android.quickstep.RecentsModel;
		import com.android.quickstep.RecentsModel.TaskVisualsChangeListener;
		import com.android.quickstep.SysUINavigationMode;
		import com.android.quickstep.SystemUiProxy;
		import com.android.quickstep.TaskThumbnailCache;
		import com.android.quickstep.TaskUtils;
		@@ -802,14 +801,11 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
		@Override
		public void setInsets(Rect insets) {
		mInsets.set(insets);
		resetPaddingFromTaskSize();
		}

		private void resetPaddingFromTaskSize() {
		DeviceProfile dp = mActivity.getDeviceProfile();
		getTaskSize(dp, mTempRect);
		mTaskWidth = mTempRect.width();
		mTaskHeight = mTempRect.height();

		mTempRect.top -= mTaskTopMargin;
		setPadding(mTempRect.left - mInsets.left, mTempRect.top - mInsets.top,
		dp.widthPx - mInsets.right - mTempRect.right,
		@@ -1575,7 +1571,6 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
		mActivity.getDragLayer().recreateControllers();
		mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION,
		touchRotation != 0 \|\| launcherRotation != 0);
		resetPaddingFromTaskSize();
		requestLayout();
		}
		}

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ import com.android.launcher3.util.Themes;
		import com.android.quickstep.TaskOverlayFactory;
		import com.android.quickstep.TaskOverlayFactory.TaskOverlay;
		import com.android.quickstep.views.TaskView.FullscreenDrawParams;
		import com.android.quickstep.util.RecentsOrientedState;
		import com.android.systemui.plugins.OverviewScreenshotActions;
		import com.android.systemui.plugins.PluginListener;
		import com.android.systemui.shared.recents.model.Task;

quickstep/src/com/android/quickstep/SysUINavigationMode.java

+4 −10

Original line number	Diff line number	Diff line
		@@ -24,9 +24,7 @@ import android.content.Intent;
		import android.content.res.Resources;
		import android.util.Log;

		import com.android.launcher3.Launcher;
		import com.android.launcher3.util.MainThreadInitializedObject;
		import com.android.quickstep.views.RecentsView;

		import java.io.PrintWriter;
		import java.util.ArrayList;
		@@ -130,14 +128,10 @@ public class SysUINavigationMode {
		}
		}

		public static boolean removeShelfFromOverview(Launcher launcher) {
		// The shelf is core to the two-button mode model, so we need to continue supporting it
		// when in portrait.
		if (getMode(launcher) != Mode.TWO_BUTTONS) {
		return true;
		}
		RecentsView recentsView = launcher.getOverviewPanel();
		return !recentsView.getPagedOrientationHandler().isLayoutNaturalToLauncher();
		/** @return Whether we can remove the shelf from overview. */
		public static boolean removeShelfFromOverview(Context context) {
		// The shelf is core to the two-button mode model, so we need to continue supporting it.
		return getMode(context) != Mode.TWO_BUTTONS;
		}

		public void dump(PrintWriter pw) {

quickstep/src/com/android/quickstep/util/LayoutUtils.java

+7 −12

Original line number	Diff line number	Diff line
		@@ -16,8 +16,7 @@
		package com.android.quickstep.util;

		import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
		import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
		import static com.android.quickstep.SysUINavigationMode.getMode;
		import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;

		import static java.lang.annotation.RetentionPolicy.SOURCE;

		@@ -61,7 +60,7 @@ public class LayoutUtils {
		} else {
		Resources res = context.getResources();

		if (showOverviewActions(context)) {
		if (ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(context)) {
		//TODO: this needs to account for the swipe gesture height and accessibility
		// UI when shown.
		extraSpace = res.getDimensionPixelSize(R.dimen.overview_actions_height);
		@@ -77,7 +76,7 @@ public class LayoutUtils {

		public static void calculateFallbackTaskSize(Context context, DeviceProfile dp, Rect outRect) {
		float extraSpace;
		if (showOverviewActions(context)) {
		if (ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(context)) {
		extraSpace = context.getResources()
		.getDimensionPixelSize(R.dimen.overview_actions_height);
		} else {
		@@ -92,7 +91,7 @@ public class LayoutUtils {
		float taskWidth, taskHeight, paddingHorz;
		Resources res = context.getResources();
		Rect insets = dp.getInsets();
		final boolean showLargeTaskSize = showOverviewActions(context);
		final boolean overviewActionsEnabled = ENABLE_OVERVIEW_ACTIONS.get();

		if (dp.isMultiWindowMode) {
		if (multiWindowStrategy == MULTI_WINDOW_STRATEGY_HALF_SCREEN) {
		@@ -122,7 +121,7 @@ public class LayoutUtils {
		final int paddingResId;
		if (dp.isVerticalBarLayout()) {
		paddingResId = R.dimen.landscape_task_card_horz_space;
		} else if (showLargeTaskSize) {
		} else if (overviewActionsEnabled && removeShelfFromOverview(context)) {
		paddingResId = R.dimen.portrait_task_card_horz_space_big_overview;
		} else {
		paddingResId = R.dimen.portrait_task_card_horz_space;
		@@ -131,7 +130,7 @@ public class LayoutUtils {
		}

		float topIconMargin = res.getDimension(R.dimen.task_thumbnail_top_margin);
		float paddingVert = showLargeTaskSize
		float paddingVert = overviewActionsEnabled && removeShelfFromOverview(context)
		? 0 : res.getDimension(R.dimen.task_card_vert_space);

		// Note this should be same as dp.availableWidthPx and dp.availableHeightPx unless
		@@ -157,7 +156,7 @@ public class LayoutUtils {

		public static int getShelfTrackingDistance(Context context, DeviceProfile dp) {
		// Track the bottom of the window.
		if (showOverviewActions(context)) {
		if (ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(context)) {
		Rect taskSize = new Rect();
		calculateLauncherTaskSize(context, dp, taskSize);
		return (dp.heightPx - taskSize.height()) / 2;
		@@ -181,8 +180,4 @@ public class LayoutUtils {
		return srcHeight / targetHeight;
		}
		}

		private static boolean showOverviewActions(Context context) {
		return ENABLE_OVERVIEW_ACTIONS.get() && getMode(context) != TWO_BUTTONS;
		}
		}