Merging ub-launcher3-master, build 5945220 (b6af1d0e) · Commits · e / os / android_packages_apps_Trebuchet

Android.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ LOCAL_USE_AAPT2 := true
		LOCAL_AAPT2_ONLY := true
		LOCAL_MODULE_TAGS := optional

		LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano
		LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLibLauncherWrapper launcherprotosnano
		ifneq (,$(wildcard frameworks/base))
		LOCAL_PRIVATE_PLATFORM_APIS := true
		else
		@@ -216,7 +216,7 @@ include $(CLEAR_VARS)
		LOCAL_USE_AAPT2 := true
		LOCAL_MODULE_TAGS := optional

		LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano
		LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLibLauncherWrapper launcherprotosnano
		ifneq (,$(wildcard frameworks/base))
		LOCAL_PRIVATE_PLATFORM_APIS := true
		else
		@@ -262,7 +262,7 @@ include $(CLEAR_VARS)
		LOCAL_USE_AAPT2 := true
		LOCAL_MODULE_TAGS := optional

		LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano
		LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLibLauncherWrapper launcherprotosnano
		ifneq (,$(wildcard frameworks/base))
		LOCAL_PRIVATE_PLATFORM_APIS := true
		else

go/quickstep/src/com/android/launcher3/GoLauncherAppTransitionManagerImpl.java

+9 −5

Original line number	Diff line number	Diff line
		@@ -40,7 +40,9 @@ public final class GoLauncherAppTransitionManagerImpl extends QuickstepAppTransi

		@Override
		protected void composeRecentsLaunchAnimator(AnimatorSet anim, View v,
		RemoteAnimationTargetCompat[] targets, boolean launcherClosing) {
		RemoteAnimationTargetCompat[] appTargets,
		RemoteAnimationTargetCompat[] wallpaperTargets,
		boolean launcherClosing) {
		// Stubbed. Recents launch animation will come from the recents view itself and will not
		// use remote animations.
		}
		@@ -74,21 +76,23 @@ public final class GoLauncherAppTransitionManagerImpl extends QuickstepAppTransi
		}

		@Override
		public void onCreateAnimation(RemoteAnimationTargetCompat[] targetCompats,
		public void onCreateAnimation(RemoteAnimationTargetCompat[] appTargets,
		RemoteAnimationTargetCompat[] wallpaperTargets,
		AnimationResult result) {
		boolean isGoingToRecents =
		taskIsATargetWithMode(targetCompats, mLauncher.getTaskId(), MODE_OPENING)
		taskIsATargetWithMode(appTargets, mLauncher.getTaskId(), MODE_OPENING)
		&& (mLauncher.getStateManager().getState() == LauncherState.OVERVIEW);
		if (isGoingToRecents) {
		IconRecentsView recentsView = mLauncher.getOverviewPanel();
		if (!recentsView.isReadyForRemoteAnim()) {
		recentsView.setOnReadyForRemoteAnimCallback(() ->
		postAsyncCallback(mHandler, () -> onCreateAnimation(targetCompats, result))
		postAsyncCallback(mHandler, () -> onCreateAnimation(appTargets,
		wallpaperTargets, result))
		);
		return;
		}
		}
		super.onCreateAnimation(targetCompats, result);
		super.onCreateAnimation(appTargets, wallpaperTargets, result);
		}
		}
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -89,5 +89,5 @@ public abstract class RecentsUiFactory {
		return RotationMode.NORMAL;
		}

		public static void clearSwipeSharedState(boolean finishAnimation) {}
		public static void clearSwipeSharedState(Launcher launcher, boolean finishAnimation) { }
		}

go/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java

+15 −14

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import android.util.Log;
		import com.android.launcher3.BaseDraggingActivity;
		import com.android.launcher3.LauncherAnimationRunner;
		import com.android.quickstep.util.RemoteAnimationProvider;
		import com.android.quickstep.util.RemoteAnimationTargetSet;
		import com.android.quickstep.views.IconRecentsView;
		import com.android.systemui.shared.system.ActivityOptionsCompat;
		import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
		@@ -47,12 +46,12 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple
		RemoteAnimationProvider {
		private static final String TAG = "AppToOverviewAnimationProvider";

		private final ActivityControlHelper<T> mHelper;
		private final BaseActivityInterface<T> mHelper;
		private final int mTargetTaskId;
		private IconRecentsView mRecentsView;
		private AppToOverviewAnimationListener mAnimationReadyListener;

		AppToOverviewAnimationProvider(ActivityControlHelper<T> helper, int targetTaskId) {
		AppToOverviewAnimationProvider(BaseActivityInterface<T> helper, int targetTaskId) {
		mHelper = helper;
		mTargetTaskId = targetTaskId;
		}
		@@ -76,7 +75,7 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple
		if (mAnimationReadyListener != null) {
		mAnimationReadyListener.onActivityReady(activity);
		}
		ActivityControlHelper.AnimationFactory factory =
		BaseActivityInterface.AnimationFactory factory =
		mHelper.prepareRecentsUI(activity, wasVisible,
		false /* animate activity */, (controller) -> {
		controller.dispatchOnStart();
		@@ -86,7 +85,7 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple
		anim.start();
		});
		factory.onRemoteAnimationReceived(null);
		factory.createActivityController(getRecentsLaunchDuration());
		factory.createActivityInterface(getRecentsLaunchDuration());
		mRecentsView = activity.getOverviewPanel();
		return false;
		}
		@@ -95,11 +94,12 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple
		* Create remote window animation from the currently running app to the overview panel. Should
		* be called after {@link #onActivityReady}.
		*
		* @param targetCompats the target apps
		* @param appTargets the target apps
		* @return animation from app to overview
		*/
		@Override
		public AnimatorSet createWindowAnimation(RemoteAnimationTargetCompat[] targetCompats) {
		public AnimatorSet createWindowAnimation(RemoteAnimationTargetCompat[] appTargets,
		RemoteAnimationTargetCompat[] wallpaperTargets) {
		if (mAnimationReadyListener != null) {
		mAnimationReadyListener.onWindowAnimationCreated();
		}
		@@ -112,14 +112,14 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple
		return anim;
		}

		RemoteAnimationTargetSet targetSet =
		new RemoteAnimationTargetSet(targetCompats, MODE_CLOSING);
		mRecentsView.setTransitionedFromApp(!targetSet.isAnimatingHome());
		RemoteAnimationTargets targets =
		new RemoteAnimationTargets(appTargets, wallpaperTargets, MODE_CLOSING);
		mRecentsView.setTransitionedFromApp(!targets.isAnimatingHome());

		RemoteAnimationTargetCompat recentsTarget = null;
		RemoteAnimationTargetCompat closingAppTarget = null;

		for (RemoteAnimationTargetCompat target : targetCompats) {
		for (RemoteAnimationTargetCompat target : appTargets) {
		if (target.mode == MODE_OPENING) {
		recentsTarget = target;
		} else if (target.mode == MODE_CLOSING && target.taskId == mTargetTaskId) {
		@@ -157,16 +157,17 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple
		false /* startAtFrontOfQueue */) {

		@Override
		public void onCreateAnimation(RemoteAnimationTargetCompat[] targetCompats,
		public void onCreateAnimation(RemoteAnimationTargetCompat[] appTargets,
		RemoteAnimationTargetCompat[] wallpaperTargets,
		AnimationResult result) {
		IconRecentsView recentsView = mRecentsView;
		if (!recentsView.isReadyForRemoteAnim()) {
		recentsView.setOnReadyForRemoteAnimCallback(() -> postAsyncCallback(handler,
		() -> onCreateAnimation(targetCompats, result))
		() -> onCreateAnimation(appTargets, wallpaperTargets, result))
		);
		return;
		}
		result.setAnimation(createWindowAnimation(targetCompats), context);
		result.setAnimation(createWindowAnimation(appTargets, wallpaperTargets), context);
		}
		};
		return ActivityOptionsCompat.makeRemoteAnimation(

go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java→go/quickstep/src/com/android/quickstep/FallbackActivityInterface.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -26,21 +26,21 @@ import androidx.annotation.Nullable;

		import com.android.launcher3.anim.AnimatorPlaybackController;
		import com.android.launcher3.userevent.nano.LauncherLogProto;
		import com.android.quickstep.util.RemoteAnimationTargetSet;
		import com.android.quickstep.util.ActivityInitListener;
		import com.android.quickstep.views.IconRecentsView;

		import java.util.function.BiPredicate;
		import java.util.function.Consumer;

		/**
		* {@link ActivityControlHelper} for recents when the default launcher is different than the
		* {@link BaseActivityInterface} for recents when the default launcher is different than the
		* currently running one and apps should interact with the {@link RecentsActivity} as opposed
		* to the in-launcher one.
		*/
		public final class FallbackActivityControllerHelper extends
		GoActivityControlHelper<RecentsActivity> {
		public final class FallbackActivityInterface extends
		GoActivityInterface<RecentsActivity> {

		public FallbackActivityControllerHelper() { }
		public FallbackActivityInterface() { }

		@Override
		public AnimationFactory prepareRecentsUI(RecentsActivity activity, boolean activityVisible,
		@@ -58,17 +58,17 @@ public final class FallbackActivityControllerHelper extends
		boolean isAnimatingToRecents = false;

		@Override
		public void onRemoteAnimationReceived(RemoteAnimationTargetSet targets) {
		public void onRemoteAnimationReceived(RemoteAnimationTargets targets) {
		isAnimatingToRecents = targets != null && targets.isAnimatingHome();
		if (!isAnimatingToRecents) {
		rv.setAlpha(1);
		}
		createActivityController(getSwipeUpDestinationAndLength(
		createActivityInterface(getSwipeUpDestinationAndLength(
		activity.getDeviceProfile(), activity, new Rect()));
		}

		@Override
		public void createActivityController(long transitionLength) {
		public void createActivityInterface(long transitionLength) {
		if (!isAnimatingToRecents) {
		return;
		}
		@@ -85,13 +85,13 @@ public final class FallbackActivityControllerHelper extends
		@Override
		public ActivityInitListener createActivityInitListener(
		BiPredicate<RecentsActivity, Boolean> onInitListener) {
		return new RecentsActivityTracker(onInitListener);
		return new ActivityInitListener(onInitListener, RecentsActivity.ACTIVITY_TRACKER);
		}

		@Nullable
		@Override
		public RecentsActivity getCreatedActivity() {
		return RecentsActivityTracker.getCurrentActivity();
		return RecentsActivity.ACTIVITY_TRACKER.getCreatedActivity();
		}

		@Nullable