Merge "Land ENABLE_TASKBAR_IN_OVERVIEW" into tm-qpr-dev (6a10a003) · Commits · e / os / android_packages_apps_Trebuchet

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

+1 −29

Original line number	Diff line number	Diff line
		@@ -112,7 +112,6 @@ import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
		import com.android.launcher3.LauncherAnimationRunner.RemoteAnimationFactory;
		import com.android.launcher3.anim.AnimationSuccessListener;
		import com.android.launcher3.anim.AnimatorListeners;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.dragndrop.DragLayer;
		import com.android.launcher3.icons.FastBitmapDrawable;
		import com.android.launcher3.model.data.ItemInfo;
		@@ -557,11 +556,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener

		final boolean scrimEnabled = ENABLE_SCRIM_FOR_APP_LAUNCH.get();
		if (scrimEnabled) {
		boolean useTaskbarColor = mDeviceProfile.isTaskbarPresentInApps
		&& !FeatureFlags.ENABLE_TASKBAR_IN_OVERVIEW.get();
		int scrimColor = useTaskbarColor
		? mLauncher.getResources().getColor(R.color.taskbar_background)
		: Themes.getAttrColor(mLauncher, R.attr.overviewScrimColor);
		int scrimColor = Themes.getAttrColor(mLauncher, R.attr.overviewScrimColor);
		int scrimColorTrans = ColorUtils.setAlphaComponent(scrimColor, 0);
		int[] colors = isAppOpening
		? new int[]{scrimColorTrans, scrimColor}
		@@ -575,29 +570,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		scrim.setDuration(CONTENT_SCRIM_DURATION);
		scrim.setInterpolator(DEACCEL_1_5);

		if (useTaskbarColor) {
		// Hide the taskbar background color since it would duplicate the scrim.
		scrim.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationStart(Animator animation) {
		LauncherTaskbarUIController taskbarUIController =
		mLauncher.getTaskbarUIController();
		if (taskbarUIController != null) {
		taskbarUIController.forceHideBackground(true);
		}
		}

		@Override
		public void onAnimationEnd(Animator animation) {
		LauncherTaskbarUIController taskbarUIController =
		mLauncher.getTaskbarUIController();
		if (taskbarUIController != null) {
		taskbarUIController.forceHideBackground(false);
		}
		}
		});
		}

		launcherAnimator.play(scrim);
		}
		}

quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,8 @@ public class FallbackTaskbarUIController extends TaskbarUIController {
		public Animator createAnimToRecentsState(RecentsState toState, long duration) {
		boolean useStashedLauncherState = toState.hasOverviewActions();
		boolean stashedLauncherState =
		useStashedLauncherState && !FeatureFlags.ENABLE_TASKBAR_IN_OVERVIEW.get();
		useStashedLauncherState && FeatureFlags.ENABLE_GRID_ONLY_OVERVIEW.get()
		&& toState == RecentsState.MODAL_TASK;
		TaskbarStashController stashController = mControllers.taskbarStashController;
		// Set both FLAG_IN_STASHED_LAUNCHER_STATE and FLAG_IN_APP to ensure the state is respected.
		// For all other states, just use the current stashed-in-app setting (e.g. if long clicked).

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java

+0 −30

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ import com.android.launcher3.QuickstepTransitionManager;
		import com.android.launcher3.R;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.anim.AnimatedFloat;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.logging.InstanceId;
		import com.android.launcher3.logging.InstanceIdSequence;
		import com.android.launcher3.model.data.ItemInfo;
		@@ -86,7 +85,6 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
		};

		// Initialized in init.
		private AnimatedFloat mTaskbarOverrideBackgroundAlpha;
		private TaskbarKeyguardController mKeyguardController;
		private final TaskbarLauncherStateController
		mTaskbarLauncherStateController = new TaskbarLauncherStateController();
		@@ -100,8 +98,6 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
		super.init(taskbarControllers);

		mTaskbarLauncherStateController.init(mControllers, mLauncher);
		mTaskbarOverrideBackgroundAlpha = mControllers.taskbarDragLayerController
		.getOverrideBackgroundAlpha();

		mLauncher.setTaskbarUIController(this);
		mKeyguardController = taskbarControllers.taskbarKeyguardController;
		@@ -255,13 +251,6 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
		}
		}

		/**
		* Sets whether the background behind the taskbar/nav bar should be hidden.
		*/
		public void forceHideBackground(boolean forceHide) {
		mTaskbarOverrideBackgroundAlpha.updateValue(forceHide ? 0 : 1);
		}

		/**
		* Starts a Taskbar EDU flow, if the user should see one upon launching an application.
		*/
		@@ -318,21 +307,6 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
		instanceId);
		}

		@Override
		public void setSystemGestureInProgress(boolean inProgress) {
		super.setSystemGestureInProgress(inProgress);
		if (DisplayController.isTransientTaskbar(mLauncher)) {
		forceHideBackground(false);
		return;
		}
		if (!FeatureFlags.ENABLE_TASKBAR_IN_OVERVIEW.get()) {
		// Launcher's ScrimView will draw the background throughout the gesture. But once the
		// gesture ends, start drawing taskbar's background again since launcher might stop
		// drawing.
		forceHideBackground(inProgress);
		}
		}

		/**
		* Animates Taskbar elements during a transition to a Launcher state that should use in-app
		* layouts.
		@@ -401,10 +375,6 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
		public void dumpLogs(String prefix, PrintWriter pw) {
		super.dumpLogs(prefix, pw);

		pw.println(String.format(
		"%s\tmTaskbarOverrideBackgroundAlpha=%.2f",
		prefix,
		mTaskbarOverrideBackgroundAlpha.value));
		pw.println(String.format("%s\tTaskbar in-app display progress:", prefix));
		mTaskbarInAppDisplayProgressMultiProp.dump(
		prefix + "\t",

quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -127,10 +127,6 @@ public class TaskbarDragLayerController implements TaskbarControllers.LoggableTa
		return mAssistantBgTaskbar;
		}

		public AnimatedFloat getOverrideBackgroundAlpha() {
		return mBgOverride;
		}

		public AnimatedFloat getTaskbarBackgroundOffset() {
		return mBgOffset;
		}

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -24,9 +24,7 @@ import android.graphics.Color;
		import com.android.launcher3.BaseDraggingActivity;
		import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.Launcher;
		import com.android.launcher3.R;
		import com.android.launcher3.allapps.AllAppsTransitionController;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.quickstep.util.LayoutUtils;
		import com.android.quickstep.views.DesktopTaskView;
		import com.android.quickstep.views.RecentsView;
		@@ -103,10 +101,6 @@ public class BackgroundAppState extends OverviewState {

		@Override
		public int getWorkspaceScrimColor(Launcher launcher) {
		DeviceProfile dp = launcher.getDeviceProfile();
		if (dp.isTaskbarPresentInApps && !FeatureFlags.ENABLE_TASKBAR_IN_OVERVIEW.get()) {
		return launcher.getColor(R.color.taskbar_background);
		}
		return Color.TRANSPARENT;
		}