Merge "Various multi-window fixes" into ub-launcher3-rvc-dev (2d60935e) · Commits · e / os / android_packages_apps_Trebuchet

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

+1 −18

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import com.android.launcher3.allapps.AllAppsTransitionController;
		import com.android.launcher3.userevent.nano.LauncherLogProto;
		import com.android.quickstep.util.LayoutUtils;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskView;

		/**
		* State indicating that the Launcher is behind an app
		@@ -66,23 +65,7 @@ public class BackgroundAppState extends OverviewState {
		}

		private float getOverviewScale(Launcher launcher) {
		// Initialize the recents view scale to what it would be when starting swipe up
		RecentsView recentsView = launcher.getOverviewPanel();
		int taskCount = recentsView.getTaskViewCount();
		if (taskCount == 0) return 1;

		TaskView dummyTask;
		if (recentsView.getCurrentPage() >= recentsView.getTaskViewStartIndex()) {
		if (recentsView.getCurrentPage() <= taskCount - 1) {
		dummyTask = recentsView.getCurrentPageTaskView();
		} else {
		dummyTask = recentsView.getTaskViewAt(taskCount - 1);
		}
		} else {
		dummyTask = recentsView.getTaskViewAt(0);
		}
		return recentsView.getTempAppWindowAnimationHelper()
		.updateForFullscreenOverview(dummyTask).getSrcToTargetScale();
		return ((RecentsView) launcher.getOverviewPanel()).getMaxScaleForFullScreen();
		}

		@Override

+1 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.animation.Animator;
		import android.annotation.TargetApi;
		import android.content.Context;
		import android.content.Intent;
		import android.graphics.Point;
		import android.graphics.PointF;
		import android.graphics.Rect;
		import android.graphics.RectF;
		@@ -265,8 +264,7 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten
		if (targets.minimizedHomeBounds != null && runningTaskTarget != null) {
		overviewStackBounds = mActivityInterface
		.getOverviewWindowBounds(targets.minimizedHomeBounds, runningTaskTarget);
		dp = dp.getMultiWindowProfile(mContext, new Point(
		overviewStackBounds.width(), overviewStackBounds.height()));
		dp = dp.getMultiWindowProfile(mContext, overviewStackBounds);
		} else {
		// If we are not in multi-window mode, home insets should be same as system insets.
		dp = dp.copy(mContext);

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.quickstep;
		import static com.android.launcher3.anim.Interpolators.LINEAR;
		import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
		import static com.android.quickstep.fallback.FallbackRecentsView.ZOOM_PROGRESS;
		import static com.android.quickstep.util.WindowSizeStrategy.FALLBACK_RECENTS_SIZE_STRATEGY;
		import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;

		import android.animation.Animator;
		@@ -36,7 +37,6 @@ import com.android.launcher3.anim.AnimatorPlaybackController;
		import com.android.launcher3.userevent.nano.LauncherLogProto;
		import com.android.quickstep.fallback.FallbackRecentsView;
		import com.android.quickstep.util.ActivityInitListener;
		import com.android.quickstep.util.LayoutUtils;
		import com.android.quickstep.views.RecentsView;
		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

		@@ -60,7 +60,7 @@ public final class FallbackActivityInterface implements

		@Override
		public int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rect outRect) {
		LayoutUtils.calculateFallbackTaskSize(context, dp, outRect);
		FALLBACK_RECENTS_SIZE_STRATEGY.calculateTaskSize(context, dp, outRect);
		if (dp.isVerticalBarLayout()
		&& SysUINavigationMode.INSTANCE.get(context).getMode() != NO_BUTTON) {
		Rect targetInsets = dp.getInsets();

+2 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_2;
		import static com.android.launcher3.anim.Interpolators.INSTANT;
		import static com.android.launcher3.anim.Interpolators.LINEAR;
		import static com.android.quickstep.LauncherSwipeHandler.RECENTS_ATTACH_DURATION;
		import static com.android.quickstep.util.WindowSizeStrategy.LAUNCHER_ACTIVITY_SIZE_STRATEGY;
		import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET;

		import android.animation.Animator;
		@@ -82,7 +83,7 @@ public final class LauncherActivityInterface implements BaseActivityInterface<La

		@Override
		public int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rect outRect) {
		LayoutUtils.calculateLauncherTaskSize(context, dp, outRect);
		LAUNCHER_ACTIVITY_SIZE_STRATEGY.calculateTaskSize(context, dp, outRect);
		if (dp.isVerticalBarLayout() && SysUINavigationMode.getMode(context) != Mode.NO_BUTTON) {
		Rect targetInsets = dp.getInsets();
		int hotseatInset = dp.isSeascape() ? targetInsets.left : targetInsets.right;

+2 −3

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
		import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
		import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.HIDE;
		import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.PEEK;
		import static com.android.quickstep.util.WindowSizeStrategy.LAUNCHER_ACTIVITY_SIZE_STRATEGY;
		import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;

		import android.animation.Animator;
		@@ -80,7 +81,6 @@ import com.android.quickstep.GestureState.GestureEndTarget;
		import com.android.quickstep.inputconsumers.OverviewInputConsumer;
		import com.android.quickstep.util.ActiveGestureLog;
		import com.android.quickstep.util.AppWindowAnimationHelper.TargetAlphaProvider;
		import com.android.quickstep.util.LayoutUtils;
		import com.android.quickstep.util.RectFSpringAnim;
		import com.android.quickstep.util.ShelfPeekAnim;
		import com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState;
		@@ -208,8 +208,7 @@ public class LauncherSwipeHandler<T extends BaseDraggingActivity>
		mTaskAnimationManager = taskAnimationManager;
		mTouchTimeMs = touchTimeMs;
		mContinuingLastGesture = continuingLastGesture;
		mTaskViewSimulator = new TaskViewSimulator(
		context, LayoutUtils::calculateLauncherTaskSize, true);
		mTaskViewSimulator = new TaskViewSimulator(context, LAUNCHER_ACTIVITY_SIZE_STRATEGY);

		initAfterSubclassConstructor();
		initStateCallbacks();