Merge "Clean up shell transition check in central surfaces" into main (3931b835) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java

+4 −10

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package com.android.systemui.statusbar.phone;

		import static com.android.wm.shell.transition.Transitions.ENABLE_SHELL_TRANSITIONS;

		import android.annotation.Nullable;
		import android.app.ActivityOptions;
		import android.content.Context;
		@@ -146,14 +144,10 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner, CoreStartable
		@Nullable RemoteAnimationAdapter animationAdapter) {
		ActivityOptions options;
		if (animationAdapter != null) {
		if (ENABLE_SHELL_TRANSITIONS) {
		options = ActivityOptions.makeRemoteTransition(
		new RemoteTransition(
		RemoteAnimationRunnerCompat.wrap(animationAdapter.getRunner()),
		animationAdapter.getCallingApplication(), "SysUILaunch"));
		} else {
		options = ActivityOptions.makeRemoteAnimation(animationAdapter);
		}
		} else {
		options = ActivityOptions.makeBasic();
		}