Merge "Allow QuickstepTransitionManager to be overridden" into tm-qpr-dev (bc333343) · Commits · e / os / android_packages_apps_Trebuchet

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

+28 −22

Original line number	Original line	Diff line number	Diff line
	@@ -213,9 +213,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
	private static final int WIDGET_CROSSFADE_DURATION_MILLIS = 125;		private static final int WIDGET_CROSSFADE_DURATION_MILLIS = 125;

	protected final QuickstepLauncher mLauncher;		protected final QuickstepLauncher mLauncher;
	private final DragLayer mDragLayer;		protected final DragLayer mDragLayer;

	final Handler mHandler;		protected final Handler mHandler;

	private final float mClosingWindowTransY;		private final float mClosingWindowTransY;
	private final float mMaxShadowRadius;		private final float mMaxShadowRadius;
	@@ -1097,9 +1097,18 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
	return;		return;
	}		}
	if (hasControlRemoteAppTransitionPermission()) {		if (hasControlRemoteAppTransitionPermission()) {
	mWallpaperOpenRunner = createWallpaperOpenRunner(false /* fromUnlock */);

	RemoteAnimationDefinition definition = new RemoteAnimationDefinition();		RemoteAnimationDefinition definition = new RemoteAnimationDefinition();
			addRemoteAnimations(definition);
			mLauncher.registerRemoteAnimations(definition);
			}
			}

			/**
			* Adds remote animations to a {@link RemoteAnimationDefinition}. May be overridden to add
			* additional animations.
			*/
			protected void addRemoteAnimations(RemoteAnimationDefinition definition) {
			mWallpaperOpenRunner = createWallpaperOpenRunner(false /* fromUnlock */);
	definition.addRemoteAnimation(WindowManager.TRANSIT_OLD_WALLPAPER_OPEN,		definition.addRemoteAnimation(WindowManager.TRANSIT_OLD_WALLPAPER_OPEN,
	WindowConfiguration.ACTIVITY_TYPE_STANDARD,		WindowConfiguration.ACTIVITY_TYPE_STANDARD,
	new RemoteAnimationAdapter(		new RemoteAnimationAdapter(
	@@ -1117,9 +1126,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
	true /* startAtFrontOfQueue */),		true /* startAtFrontOfQueue */),
	CLOSING_TRANSITION_DURATION_MS, 0 /* statusBarTransitionDelay */));		CLOSING_TRANSITION_DURATION_MS, 0 /* statusBarTransitionDelay */));
	}		}

	mLauncher.registerRemoteAnimations(definition);
	}
	}		}

	/**		/**
	@@ -1163,7 +1169,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
	SystemUiProxy.INSTANCE.get(mLauncher).setStartingWindowListener(null);		SystemUiProxy.INSTANCE.get(mLauncher).setStartingWindowListener(null);
	}		}

	private void unregisterRemoteAnimations() {		protected void unregisterRemoteAnimations() {
	if (SEPARATE_RECENTS_ACTIVITY.get()) {		if (SEPARATE_RECENTS_ACTIVITY.get()) {
	return;		return;
	}		}

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

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -239,7 +239,7 @@ public class QuickstepLauncher extends Launcher {
	mActionsView.updateDimension(getDeviceProfile(), overviewPanel.getLastComputedTaskSize());		mActionsView.updateDimension(getDeviceProfile(), overviewPanel.getLastComputedTaskSize());
	mActionsView.updateVerticalMargin(DisplayController.getNavigationMode(this));		mActionsView.updateVerticalMargin(DisplayController.getNavigationMode(this));

	mAppTransitionManager = new QuickstepTransitionManager(this);		mAppTransitionManager = buildAppTransitionManager();
	mAppTransitionManager.registerRemoteAnimations();		mAppTransitionManager.registerRemoteAnimations();
	mAppTransitionManager.registerRemoteTransitions();		mAppTransitionManager.registerRemoteTransitions();

	@@ -308,6 +308,13 @@ public class QuickstepLauncher extends Launcher {
	return mHotseatPredictionController;		return mHotseatPredictionController;
	}		}

			/**
			* Builds the {@link QuickstepTransitionManager} instance to use for managing transitions.
			*/
			protected QuickstepTransitionManager buildAppTransitionManager() {
			return new QuickstepTransitionManager(this);
			}

	@Override		@Override
	protected QuickstepOnboardingPrefs createOnboardingPrefs(SharedPreferences sharedPrefs) {		protected QuickstepOnboardingPrefs createOnboardingPrefs(SharedPreferences sharedPrefs) {
	return new QuickstepOnboardingPrefs(this, sharedPrefs);		return new QuickstepOnboardingPrefs(this, sharedPrefs);

src/com/android/launcher3/config/FeatureFlags.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -379,6 +379,10 @@ public final class FeatureFlags {
	"Enable the ability to generate monochromatic icons, if it is not provided by the app"		"Enable the ability to generate monochromatic icons, if it is not provided by the app"
	);		);

			public static final BooleanFlag ENABLE_DREAM_TRANSITION = getDebugFlag(
			"ENABLE_DREAM_TRANSITION", true,
			"Enable the launcher transition when the device enters a dream");

	public static final BooleanFlag ENABLE_TASKBAR_EDU_TOOLTIP = getDebugFlag(		public static final BooleanFlag ENABLE_TASKBAR_EDU_TOOLTIP = getDebugFlag(
	"ENABLE_TASKBAR_EDU_TOOLTIP", true,		"ENABLE_TASKBAR_EDU_TOOLTIP", true,
	"Enable the tooltip version of the Taskbar education flow.");		"Enable the tooltip version of the Taskbar education flow.");