Merge "Clean up predictive_back_system_anims flag" into main (44359346) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -17394,13 +17394,6 @@ public final class Settings {
		public static final String DEVICE_CONFIG_SYNC_DISABLED = "device_config_sync_disabled";


		/**
		* Whether back preview animations are played when user does a back gesture or presses
		* the back button.
		* @hide
		*/
		public static final String ENABLE_BACK_ANIMATION = "enable_back_animation";

		/**
		* An allow list of packages for which the user has granted the permission to communicate
		* across profiles.

core/java/android/window/flags/windowing_frontend.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -112,13 +112,6 @@ flag {
		is_fixed_read_only: true
		}

		flag {
		name: "predictive_back_system_anims"
		namespace: "systemui"
		description: "Predictive back for system animations"
		bug: "320510464"
		}

		flag {
		name: "remove_activity_starter_dream_callback"
		namespace: "windowing_frontend"

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java

+6 −73

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import static android.window.TransitionInfo.FLAG_MOVED_TO_TOP;
		import static android.window.TransitionInfo.FLAG_SHOW_WALLPAPER;

		import static com.android.internal.jank.InteractionJankMonitor.CUJ_PREDICTIVE_BACK_HOME;
		import static com.android.window.flags.Flags.predictiveBackSystemAnims;
		import static com.android.window.flags.Flags.unifyBackNavigationTransition;
		import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BACK_PREVIEW;

		@@ -40,23 +39,17 @@ import android.app.ActivityTaskManager;
		import android.app.IActivityTaskManager;
		import android.app.TaskInfo;
		import android.content.ComponentName;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.res.Configuration;
		import android.database.ContentObserver;
		import android.graphics.Point;
		import android.graphics.Rect;
		import android.hardware.input.InputManager;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.RemoteCallback;
		import android.os.RemoteException;
		import android.os.SystemClock;
		import android.os.SystemProperties;
		import android.os.UserHandle;
		import android.provider.Settings.Global;
		import android.util.Log;
		import android.view.IRemoteAnimationRunner;
		import android.view.InputDevice;
		@@ -92,7 +85,6 @@ import com.android.wm.shell.common.ExternalInterfaceBinder;
		import com.android.wm.shell.common.RemoteCallable;
		import com.android.wm.shell.common.ShellExecutor;
		import com.android.wm.shell.shared.TransitionUtil;
		import com.android.wm.shell.shared.annotations.ShellBackgroundThread;
		import com.android.wm.shell.shared.annotations.ShellMainThread;
		import com.android.wm.shell.sysui.ConfigurationChangeListener;
		import com.android.wm.shell.sysui.ShellCommandHandler;
		@@ -102,7 +94,6 @@ import com.android.wm.shell.transition.Transitions;

		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.concurrent.atomic.AtomicBoolean;
		import java.util.function.Predicate;

		/**
		@@ -111,14 +102,7 @@ import java.util.function.Predicate;
		public class BackAnimationController implements RemoteCallable<BackAnimationController>,
		ConfigurationChangeListener {
		private static final String TAG = "ShellBackPreview";
		private static final int SETTING_VALUE_OFF = 0;
		private static final int SETTING_VALUE_ON = 1;
		public static final boolean IS_ENABLED =
		SystemProperties.getInt("persist.wm.debug.predictive_back",
		SETTING_VALUE_ON) == SETTING_VALUE_ON;

		/** Predictive back animation developer option */
		private final AtomicBoolean mEnableAnimations = new AtomicBoolean(false);

		/**
		* Max duration to wait for an animation to finish before triggering the real back.
		*/
		@@ -148,11 +132,9 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		private boolean mReceivedNullNavigationInfo = false;
		private final IActivityTaskManager mActivityTaskManager;
		private final Context mContext;
		private final ContentResolver mContentResolver;
		private final ShellController mShellController;
		private final ShellCommandHandler mShellCommandHandler;
		private final ShellExecutor mShellExecutor;
		private final Handler mBgHandler;
		private final WindowManager mWindowManager;
		private final Transitions mTransitions;
		@VisibleForTesting
		@@ -245,7 +227,6 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		@NonNull ShellInit shellInit,
		@NonNull ShellController shellController,
		@NonNull @ShellMainThread ShellExecutor shellExecutor,
		@NonNull @ShellBackgroundThread Handler backgroundHandler,
		Context context,
		@NonNull BackAnimationBackground backAnimationBackground,
		ShellBackAnimationRegistry shellBackAnimationRegistry,
		@@ -256,10 +237,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		shellInit,
		shellController,
		shellExecutor,
		backgroundHandler,
		ActivityTaskManager.getService(),
		context,
		context.getContentResolver(),
		backAnimationBackground,
		shellBackAnimationRegistry,
		shellCommandHandler,
		@@ -272,10 +251,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		@NonNull ShellInit shellInit,
		@NonNull ShellController shellController,
		@NonNull @ShellMainThread ShellExecutor shellExecutor,
		@NonNull @ShellBackgroundThread Handler bgHandler,
		@NonNull IActivityTaskManager activityTaskManager,
		Context context,
		ContentResolver contentResolver,
		@NonNull BackAnimationBackground backAnimationBackground,
		ShellBackAnimationRegistry shellBackAnimationRegistry,
		ShellCommandHandler shellCommandHandler,
		@@ -285,10 +262,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		mShellExecutor = shellExecutor;
		mActivityTaskManager = activityTaskManager;
		mContext = context;
		mContentResolver = contentResolver;
		mRequirePointerPilfer =
		context.getResources().getBoolean(R.bool.config_backAnimationRequiresPointerPilfer);
		mBgHandler = bgHandler;
		shellInit.addInitCallback(this::onInit, this);
		mAnimationBackground = backAnimationBackground;
		mShellBackAnimationRegistry = shellBackAnimationRegistry;
		@@ -305,8 +280,6 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		}

		private void onInit() {
		setupAnimationDeveloperSettingsObserver(mContentResolver, mBgHandler);
		updateEnableAnimationFromFlags();
		createAdapter();
		mShellController.addExternalInterface(IBackAnimation.DESCRIPTOR,
		this::createExternalInterface, this);
		@@ -314,42 +287,6 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		mShellController.addConfigurationChangeListener(this);
		}

		private void setupAnimationDeveloperSettingsObserver(
		@NonNull ContentResolver contentResolver,
		@NonNull @ShellBackgroundThread final Handler backgroundHandler) {
		if (predictiveBackSystemAnims()) {
		ProtoLog.d(WM_SHELL_BACK_PREVIEW, "Back animation aconfig flag is enabled, therefore "
		+ "developer settings flag is ignored and no content observer registered");
		return;
		}
		ContentObserver settingsObserver = new ContentObserver(backgroundHandler) {
		@Override
		public void onChange(boolean selfChange, Uri uri) {
		updateEnableAnimationFromFlags();
		}
		};
		contentResolver.registerContentObserver(
		Global.getUriFor(Global.ENABLE_BACK_ANIMATION),
		false, settingsObserver, UserHandle.USER_SYSTEM
		);
		}

		/**
		* Updates {@link BackAnimationController#mEnableAnimations} based on the current values of the
		* aconfig flag and the developer settings flag
		*/
		@ShellBackgroundThread
		private void updateEnableAnimationFromFlags() {
		boolean isEnabled = predictiveBackSystemAnims() \|\| isDeveloperSettingEnabled();
		mEnableAnimations.set(isEnabled);
		ProtoLog.d(WM_SHELL_BACK_PREVIEW, "Back animation enabled=%s", isEnabled);
		}

		private boolean isDeveloperSettingEnabled() {
		return Global.getInt(mContext.getContentResolver(),
		Global.ENABLE_BACK_ANIMATION, SETTING_VALUE_OFF) == SETTING_VALUE_ON;
		}

		public BackAnimation getBackAnimationImpl() {
		return mBackAnimation;
		}
		@@ -617,14 +554,13 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		private void startBackNavigation(@NonNull BackTouchTracker touchTracker) {
		try {
		startLatencyTracking();
		final BackAnimationAdapter adapter = mEnableAnimations.get()
		? mBackAnimationAdapter : null;
		if (adapter != null && mShellBackAnimationRegistry.hasSupportedAnimatorsChanged()) {
		adapter.updateSupportedAnimators(
		if (mBackAnimationAdapter != null
		&& mShellBackAnimationRegistry.hasSupportedAnimatorsChanged()) {
		mBackAnimationAdapter.updateSupportedAnimators(
		mShellBackAnimationRegistry.getSupportedAnimators());
		}
		mBackNavigationInfo = mActivityTaskManager.startBackNavigation(
		mNavigationObserver, adapter);
		mNavigationObserver, mBackAnimationAdapter);
		onBackNavigationInfoReceived(mBackNavigationInfo, touchTracker);
		} catch (RemoteException remoteException) {
		Log.e(TAG, "Failed to initAnimation", remoteException);
		@@ -696,9 +632,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		}

		private boolean shouldDispatchToAnimator() {
		return mEnableAnimations.get()
		&& mBackNavigationInfo != null
		&& mBackNavigationInfo.isPrepareRemoteAnimation();
		return mBackNavigationInfo != null && mBackNavigationInfo.isPrepareRemoteAnimation();
		}

		private void tryPilferPointers() {
		@@ -1194,7 +1128,6 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		*/
		private void dump(PrintWriter pw, String prefix) {
		pw.println(prefix + "BackAnimationController state:");
		pw.println(prefix + " mEnableAnimations=" + mEnableAnimations.get());
		pw.println(prefix + " mBackGestureStarted=" + mBackGestureStarted);
		pw.println(prefix + " mPostCommitAnimationInProgress=" + mPostCommitAnimationInProgress);
		pw.println(prefix + " mShouldStartOnNextMoveEvent=" + mShouldStartOnNextMoveEvent);

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -108,7 +108,6 @@ import com.android.wm.shell.recents.TaskStackTransitionObserver;
		import com.android.wm.shell.shared.ShellTransitions;
		import com.android.wm.shell.shared.TransactionPool;
		import com.android.wm.shell.shared.annotations.ShellAnimationThread;
		import com.android.wm.shell.shared.annotations.ShellBackgroundThread;
		import com.android.wm.shell.shared.annotations.ShellMainThread;
		import com.android.wm.shell.shared.annotations.ShellSplashscreenThread;
		import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;
		@@ -438,21 +437,18 @@ public abstract class WMShellBaseModule {
		ShellInit shellInit,
		ShellController shellController,
		@ShellMainThread ShellExecutor shellExecutor,
		@ShellBackgroundThread Handler backgroundHandler,
		BackAnimationBackground backAnimationBackground,
		Optional<ShellBackAnimationRegistry> shellBackAnimationRegistry,
		ShellCommandHandler shellCommandHandler,
		Transitions transitions,
		@ShellMainThread Handler handler
		) {
		if (BackAnimationController.IS_ENABLED) {
		return shellBackAnimationRegistry.map(
		(animations) ->
		new BackAnimationController(
		shellInit,
		shellController,
		shellExecutor,
		backgroundHandler,
		context,
		backAnimationBackground,
		animations,
		@@ -460,8 +456,6 @@ public abstract class WMShellBaseModule {
		transitions,
		handler));
		}
		return Optional.empty();
		}

		@BindsOptionalOf
		abstract ShellBackAnimationRegistry optionalBackAnimationRegistry();

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java

+0 −54

Original line number	Diff line number	Diff line
		@@ -61,9 +61,7 @@ import android.os.RemoteCallback;
		import android.os.RemoteException;
		import android.platform.test.annotations.EnableFlags;
		import android.platform.test.flag.junit.SetFlagsRule;
		import android.provider.Settings;
		import android.testing.AndroidTestingRunner;
		import android.testing.TestableContentResolver;
		import android.testing.TestableLooper;
		import android.view.IRemoteAnimationRunner;
		import android.view.KeyEvent;
		@@ -84,7 +82,6 @@ import android.window.WindowContainerToken;
		import androidx.annotation.Nullable;
		import androidx.test.filters.SmallTest;

		import com.android.internal.util.test.FakeSettingsProvider;
		import com.android.wm.shell.RootTaskDisplayAreaOrganizer;
		import com.android.wm.shell.ShellTestCase;
		import com.android.wm.shell.TestShellExecutor;
		@@ -109,7 +106,6 @@ import org.mockito.MockitoAnnotations;
		@RunWith(AndroidTestingRunner.class)
		public class BackAnimationControllerTest extends ShellTestCase {

		private static final String ANIMATION_ENABLED = "1";
		private final TestShellExecutor mShellExecutor = new TestShellExecutor();

		private ShellInit mShellInit;
		@@ -148,8 +144,6 @@ public class BackAnimationControllerTest extends ShellTestCase {
		private Transitions.TransitionHandler mTakeoverHandler;

		private BackAnimationController mController;
		private TestableContentResolver mContentResolver;
		private TestableLooper mTestableLooper;

		private DefaultCrossActivityBackAnimation mDefaultCrossActivityBackAnimation;
		private CrossTaskBackAnimation mCrossTaskBackAnimation;
		@@ -166,11 +160,6 @@ public class BackAnimationControllerTest extends ShellTestCase {
		MockitoAnnotations.initMocks(this);
		mContext.addMockSystemService(InputManager.class, mInputManager);
		mContext.getApplicationInfo().privateFlags \|= ApplicationInfo.PRIVATE_FLAG_PRIVILEGED;
		mContentResolver = new TestableContentResolver(mContext);
		mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());
		Settings.Global.putString(mContentResolver, Settings.Global.ENABLE_BACK_ANIMATION,
		ANIMATION_ENABLED);
		mTestableLooper = TestableLooper.get(this);
		mShellInit = spy(new ShellInit(mShellExecutor));
		mDefaultCrossActivityBackAnimation = new DefaultCrossActivityBackAnimation(mContext,
		mAnimationBackground, mRootTaskDisplayAreaOrganizer, mHandler);
		@@ -187,10 +176,8 @@ public class BackAnimationControllerTest extends ShellTestCase {
		mShellInit,
		mShellController,
		mShellExecutor,
		new Handler(mTestableLooper.getLooper()),
		mActivityTaskManager,
		mContext,
		mContentResolver,
		mAnimationBackground,
		mShellBackAnimationRegistry,
		mShellCommandHandler,
		@@ -341,47 +328,6 @@ public class BackAnimationControllerTest extends ShellTestCase {
		verify(mAnimatorCallback).onBackInvoked();
		}

		@Test
		public void animationDisabledFromSettings() throws RemoteException {
		// Toggle the setting off
		Settings.Global.putString(mContentResolver, Settings.Global.ENABLE_BACK_ANIMATION, "0");
		ShellInit shellInit = new ShellInit(mShellExecutor);
		mController =
		new BackAnimationController(
		shellInit,
		mShellController,
		mShellExecutor,
		new Handler(mTestableLooper.getLooper()),
		mActivityTaskManager,
		mContext,
		mContentResolver,
		mAnimationBackground,
		mShellBackAnimationRegistry,
		mShellCommandHandler,
		mTransitions,
		mHandler);
		shellInit.init();
		registerAnimation(BackNavigationInfo.TYPE_RETURN_TO_HOME);

		ArgumentCaptor<BackMotionEvent> backEventCaptor =
		ArgumentCaptor.forClass(BackMotionEvent.class);

		createNavigationInfo(BackNavigationInfo.TYPE_RETURN_TO_HOME,
		/* enableAnimation = */ false,
		/* isAnimationCallback = */ false);

		triggerBackGesture();
		releaseBackGesture();

		verify(mAppCallback, times(1)).onBackInvoked();

		verify(mAnimatorCallback, never()).onBackStarted(any());
		verify(mAnimatorCallback, never()).onBackProgressed(backEventCaptor.capture());
		verify(mAnimatorCallback, never()).onBackInvoked();
		verify(mBackAnimationRunner, never()).onAnimationStart(
		anyInt(), any(), any(), any(), any());
		}

		@Test
		public void gestureQueued_WhenPreviousTransitionHasNotYetEnded() throws RemoteException {
		registerAnimation(BackNavigationInfo.TYPE_RETURN_TO_HOME);