Merge "Update QuickstepTransitionManager to allow remote transitions to be overridden" into udc-dev (39e28c91) · Commits · e / os / BlissLauncher3

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -1086,7 +1086,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		* Adds remote animations to a {@link RemoteAnimationDefinition}. May be overridden to add
		* additional animations.
		*/
		protected void addRemoteAnimations(RemoteAnimationDefinition definition) {
		private void addRemoteAnimations(RemoteAnimationDefinition definition) {
		mWallpaperOpenRunner = createWallpaperOpenRunner(false /* fromUnlock */);
		definition.addRemoteAnimation(WindowManager.TRANSIT_OLD_WALLPAPER_OPEN,
		WindowConfiguration.ACTIVITY_TYPE_STANDARD,
		@@ -1151,7 +1151,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		SystemUiProxy.INSTANCE.get(mLauncher).setStartingWindowListener(null);
		}

		protected void unregisterRemoteAnimations() {
		private void unregisterRemoteAnimations() {
		if (SEPARATE_RECENTS_ACTIVITY.get()) {
		return;
		}
		@@ -1165,7 +1165,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		}
		}

		private void unregisterRemoteTransitions() {
		protected void unregisterRemoteTransitions() {
		if (ENABLE_SHELL_TRANSITIONS) {
		SystemUiProxy.INSTANCE.get(mLauncher).unshareTransactionQueue();
		}