Merge "Revert "Enable remote animation for keygaurd going away."" into sc-dev am: 7fea8cef4e (590aef6a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java

+6 −22

Original line number	Diff line number	Diff line
		@@ -51,7 +51,6 @@ import com.android.internal.policy.IKeyguardExitCallback;
		import com.android.internal.policy.IKeyguardService;
		import com.android.internal.policy.IKeyguardStateCallback;
		import com.android.systemui.SystemUIApplication;
		import com.android.wm.shell.transition.Transitions;

		import javax.inject.Inject;

		@@ -63,29 +62,16 @@ public class KeyguardService extends Service {
		* Run Keyguard animation as remote animation in System UI instead of local animation in
		* the server process.
		*
		* 0: Runs all keyguard animation as local animation
		* 1: Only runs keyguard going away animation as remote animation
		* 2: Runs all keyguard animation as remote animation
		*
		* Note: Must be consistent with WindowManagerService.
		*/
		private static final String ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY =
		"persist.wm.enable_remote_keyguard_animation";

		private static final int sEnableRemoteKeyguardAnimation =
		SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 1);

		/**
		* @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY
		*/
		public static boolean sEnableRemoteKeyguardGoingAwayAnimation =
		!Transitions.ENABLE_SHELL_TRANSITIONS && sEnableRemoteKeyguardAnimation >= 1;

		/**
		* @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY
		*/
		public static boolean sEnableRemoteKeyguardOccludeAnimation =
		!Transitions.ENABLE_SHELL_TRANSITIONS && sEnableRemoteKeyguardAnimation >= 2;
		static boolean sEnableRemoteKeyguardAnimation =
		SystemProperties.getBoolean(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, false);

		private final KeyguardViewMediator mKeyguardViewMediator;
		private final KeyguardLifecyclesDispatcher mKeyguardLifecyclesDispatcher;
		@@ -97,23 +83,21 @@ public class KeyguardService extends Service {
		mKeyguardViewMediator = keyguardViewMediator;
		mKeyguardLifecyclesDispatcher = keyguardLifecyclesDispatcher;

		if (sEnableRemoteKeyguardAnimation) {
		RemoteAnimationDefinition definition = new RemoteAnimationDefinition();
		if (sEnableRemoteKeyguardGoingAwayAnimation) {
		final RemoteAnimationAdapter exitAnimationAdapter =
		new RemoteAnimationAdapter(mExitAnimationRunner, 0, 0);
		definition.addRemoteAnimation(TRANSIT_OLD_KEYGUARD_GOING_AWAY, exitAnimationAdapter);
		definition.addRemoteAnimation(TRANSIT_OLD_KEYGUARD_GOING_AWAY_ON_WALLPAPER,
		exitAnimationAdapter);
		}
		if (sEnableRemoteKeyguardOccludeAnimation) {
		final RemoteAnimationAdapter occludeAnimationAdapter =
		new RemoteAnimationAdapter(mOccludeAnimationRunner, 0, 0);
		definition.addRemoteAnimation(TRANSIT_OLD_KEYGUARD_OCCLUDE, occludeAnimationAdapter);
		definition.addRemoteAnimation(TRANSIT_OLD_KEYGUARD_UNOCCLUDE, occludeAnimationAdapter);
		}
		ActivityTaskManager.getInstance().registerRemoteAnimationsForDisplay(
		DEFAULT_DISPLAY, definition);
		}
		}

		@Override
		public void onCreate() {

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -280,7 +280,7 @@ class KeyguardUnlockAnimationController @Inject constructor(
		}

		override fun onKeyguardDismissAmountChanged() {
		if (!KeyguardService.sEnableRemoteKeyguardGoingAwayAnimation) {
		if (!KeyguardService.sEnableRemoteKeyguardAnimation) {
		return
		}

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2100,7 +2100,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
		playSounds(false);
		}

		if (KeyguardService.sEnableRemoteKeyguardGoingAwayAnimation) {
		if (KeyguardService.sEnableRemoteKeyguardAnimation) {
		mSurfaceBehindRemoteAnimationFinishedCallback = finishedCallback;
		mSurfaceBehindRemoteAnimationRunning = true;

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3014,7 +3014,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		private int handleStartTransitionForKeyguardLw(boolean keyguardGoingAway, long duration) {
		final int res = applyKeyguardOcclusionChange();
		if (res != 0) return res;
		if (!WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation && keyguardGoingAway) {
		if (!WindowManagerService.sEnableRemoteKeyguardAnimation && keyguardGoingAway) {
		if (DEBUG_KEYGUARD) Slog.d(TAG, "Starting keyguard exit animation");
		startKeyguardExitAnimation(SystemClock.uptimeMillis(), duration);
		}

services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -263,8 +263,7 @@ public class KeyguardServiceDelegate {
		*/
		@Deprecated
		public void setOccluded(boolean isOccluded, boolean animate) {
		if (!WindowManagerService.sEnableRemoteKeyguardOccludeAnimation
		&& mKeyguardService != null) {
		if (!WindowManagerService.sEnableRemoteKeyguardAnimation && mKeyguardService != null) {
		if (DEBUG) Log.v(TAG, "setOccluded(" + isOccluded + ") animate=" + animate);
		mKeyguardService.setOccluded(isOccluded, animate);
		}
		@@ -404,8 +403,7 @@ public class KeyguardServiceDelegate {
		}

		public void startKeyguardExitAnimation(long startTime, long fadeoutDuration) {
		if (!WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation
		&& mKeyguardService != null) {
		if (!WindowManagerService.sEnableRemoteKeyguardAnimation && mKeyguardService != null) {
		mKeyguardService.startKeyguardExitAnimation(startTime, fadeoutDuration);
		}
		}