DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master (a12675cb) · Commits · e / os / BlissLauncher3

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -164,12 +164,6 @@ public abstract class RecentsUiFactory {
		}
		}

		if (FeatureFlags.PULL_DOWN_STATUS_BAR && Utilities.IS_DEBUG_DEVICE
		&& !launcher.getDeviceProfile().isMultiWindowMode
		&& !launcher.getDeviceProfile().isVerticalBarLayout()) {
		list.add(new StatusBarTouchController(launcher));
		}

		list.add(new LauncherTaskViewController(launcher));
		return list.toArray(new TouchController[list.size()]);
		}

+7 −7

Original line number	Diff line number	Diff line
		@@ -505,7 +505,8 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		initAnimFactory.run();
		}
		}
		AbstractFloatingView.closeAllOpenViews(activity, mWasLauncherAlreadyVisible);
		AbstractFloatingView.closeAllOpenViewsExcept(activity, mWasLauncherAlreadyVisible,
		AbstractFloatingView.TYPE_LISTENER);

		if (mWasLauncherAlreadyVisible) {
		mStateCallback.setState(STATE_LAUNCHER_DRAWN);
		@@ -1132,17 +1133,16 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		}
		if (start == end \|\| duration <= 0) {
		mLauncherTransitionController.dispatchSetInterpolator(t -> end);
		mLauncherTransitionController.getAnimationPlayer().end();
		} else {
		mLauncherTransitionController.dispatchSetInterpolator(adjustedInterpolator);
		mAnimationFactory.adjustActivityControllerInterpolators();
		mLauncherTransitionController.getAnimationPlayer().setDuration(duration);
		}
		mLauncherTransitionController.getAnimationPlayer().setDuration(Math.max(0, duration));

		if (QUICKSTEP_SPRINGS.get()) {
		mLauncherTransitionController.dispatchOnStartWithVelocity(end, velocityPxPerMs.y);
		}
		mLauncherTransitionController.getAnimationPlayer().start();
		}
		mHasLauncherTransitionControllerStarted = true;
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_TRANSITIONS;
		import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
		import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
		import static com.android.systemui.shared.system.QuickStepContract.getWindowCornerRadius;
		import static com.android.systemui.shared.system.QuickStepContract.supportsRoundedCornersOnWindows;
		import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;
		import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING;

		@@ -495,6 +496,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
		endCrop = windowTargetBounds.height();
		}

		final float initialWindowRadius = supportsRoundedCornersOnWindows(mLauncher.getResources())
		? startCrop / 2f : 0f;
		final float windowRadius = mDeviceProfile.isMultiWindowMode
		? 0 : getWindowCornerRadius(mLauncher.getResources());
		appAnimator.addUpdateListener(new MultiValueUpdateListener() {
		@@ -506,7 +509,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
		alphaDuration, LINEAR);
		FloatProp mCroppedSize = new FloatProp(startCrop, endCrop, 0, CROP_DURATION,
		EXAGGERATED_EASE);
		FloatProp mWindowRadius = new FloatProp(startCrop / 2f, windowRadius, 0,
		FloatProp mWindowRadius = new FloatProp(initialWindowRadius, windowRadius, 0,
		RADIUS_DURATION, EXAGGERATED_EASE);

		@Override

+7 −3

Original line number	Diff line number	Diff line
		@@ -952,10 +952,14 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
		mHandler.removeCallbacks(mHandleDeferredResume);
		Utilities.postAsyncCallback(mHandler, mHandleDeferredResume);

		for (OnResumeCallback cb : mOnResumeCallbacks) {
		cb.onLauncherResume();
		}
		if (!mOnResumeCallbacks.isEmpty()) {
		final ArrayList<OnResumeCallback> resumeCallbacks = new ArrayList<>(mOnResumeCallbacks);
		mOnResumeCallbacks.clear();
		for (int i = resumeCallbacks.size() - 1; i >= 0; i--) {
		resumeCallbacks.get(i).onLauncherResume();
		}
		resumeCallbacks.clear();
		}

		if (mLauncherCallbacks != null) {
		mLauncherCallbacks.onResume();

+1 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ abstract class BaseFlags {
		"ENABLE_QUICKSTEP_LIVE_TILE", false, "Enable live tile in Quickstep overview");

		public static final TogglableFlag ENABLE_HINTS_IN_OVERVIEW = new TogglableFlag(
		"ENABLE_HINTS_IN_OVERVIEW", true,
		"ENABLE_HINTS_IN_OVERVIEW", false,
		"Show chip hints and gleams on the overview screen");

		public static final TogglableFlag FAKE_LANDSCAPE_UI = new TogglableFlag(