Merge "Remove ENABLE_OVERVIEW_ACTIONS flag, defaulting to true" into ub-launcher3-master (87be28a6) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/res/values/dimens.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@

		<dimen name="recents_page_spacing">10dp</dimen>
		<dimen name="recents_clear_all_deadzone_vertical_margin">70dp</dimen>
		<dimen name="overview_peek_distance">96dp</dimen>

		<!-- The speed in dp/s at which the user needs to be scrolling in recents such that we start
		loading full resolution screenshots. -->

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

+1 −8

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ import com.android.quickstep.SystemUiProxy;
		import com.android.quickstep.util.QuickstepOnboardingPrefs;
		import com.android.quickstep.util.RemoteAnimationProvider;
		import com.android.quickstep.util.RemoteFadeOutAnimationListener;
		import com.android.quickstep.util.ShelfPeekAnim;
		import com.android.quickstep.views.OverviewActionsView;
		import com.android.quickstep.views.RecentsView;
		import com.android.systemui.shared.system.ActivityManagerWrapper;
		@@ -73,8 +72,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
		(context, arg1, arg2) -> SystemUiProxy.INSTANCE.get(context).setBackButtonAlpha(
		Float.intBitsToFloat(arg1), arg2 != 0);

		private final ShelfPeekAnim mShelfPeekAnim = new ShelfPeekAnim(this);

		private OverviewActionsView mActionsView;
		protected HotseatPredictionController mHotseatPredictionController;

		@@ -196,7 +193,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
		}

		private boolean isOverviewActionsEnabled() {
		return FeatureFlags.ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(this);
		return removeShelfFromOverview(this);
		}

		public <T extends OverviewActionsView> T getActionsView() {
		@@ -317,10 +314,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
		Stream.of(WellbeingModel.SHORTCUT_FACTORY));
		}

		public ShelfPeekAnim getShelfPeekAnim() {
		return mShelfPeekAnim;
		}

		/**
		* Returns Prediction controller for hybrid hotseat
		*/

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

+2 −10

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ import com.android.launcher3.popup.SystemShortcut;
		import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory;
		import com.android.launcher3.uioverrides.touchcontrollers.FlingAndHoldTouchController;
		import com.android.launcher3.uioverrides.touchcontrollers.LandscapeEdgeSwipeController;
		import com.android.launcher3.uioverrides.touchcontrollers.NavBarToHomeTouchController;
		import com.android.launcher3.uioverrides.touchcontrollers.NoButtonNavbarToOverviewTouchController;
		@@ -80,8 +79,8 @@ import com.android.quickstep.SysUINavigationMode.Mode;
		import com.android.quickstep.SystemUiProxy;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskView;

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

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		@@ -306,14 +305,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.PAUSE_NOT_DETECTED, "createTouchControllers.2");
		}
		if (FeatureFlags.ENABLE_OVERVIEW_ACTIONS.get()) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.PAUSE_NOT_DETECTED, "createTouchControllers.3");
		}
		list.add(new NoButtonNavbarToOverviewTouchController(this));
		} else {
		list.add(new FlingAndHoldTouchController(this));
		}
		} else {
		if (getDeviceProfile().isVerticalBarLayout()) {
		list.add(new OverviewToAllAppsTouchController(this));

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

+2 −11

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@
		package com.android.launcher3.uioverrides.states;

		import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;
		import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
		import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;

		import android.content.Context;
		@@ -26,7 +24,6 @@ import com.android.launcher3.Launcher;
		import com.android.launcher3.LauncherState;
		import com.android.launcher3.allapps.AllAppsContainerView;
		import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
		import com.android.quickstep.SysUINavigationMode;

		/**
		* Definition for AllApps state
		@@ -66,13 +63,7 @@ public class AllAppsState extends LauncherState {
		public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) {
		ScaleAndTranslation scaleAndTranslation = LauncherState.OVERVIEW
		.getWorkspaceScaleAndTranslation(launcher);
		if (SysUINavigationMode.getMode(launcher) == NO_BUTTON && !ENABLE_OVERVIEW_ACTIONS.get()) {
		float normalScale = 1;
		// Scale down halfway to where we'd be in overview, to prepare for a potential pause.
		scaleAndTranslation.scale = (scaleAndTranslation.scale + normalScale) / 2;
		} else {
		scaleAndTranslation.scale = 1;
		}
		return scaleAndTranslation;
		}

		@@ -93,7 +84,7 @@ public class AllAppsState extends LauncherState {

		@Override
		public float[] getOverviewScaleAndOffset(Launcher launcher) {
		float offset = ENABLE_OVERVIEW_ACTIONS.get() && removeShelfFromOverview(launcher) ? 1 : 0;
		float offset = removeShelfFromOverview(launcher) ? 1 : 0;
		return new float[] {0.9f, offset};
		}

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

deleted100644 → 0

+0 −31

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.launcher3.uioverrides.states;

		import com.android.launcher3.Launcher;

		public class OverviewPeekState extends OverviewState {
		private static final float OVERVIEW_OFFSET = 0.7f;

		public OverviewPeekState(int id) {
		super(id);
		}

		@Override
		public float[] getOverviewScaleAndOffset(Launcher launcher) {
		return new float[] {NO_SCALE, OVERVIEW_OFFSET};
		}
		}