Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1d6bd94 authored Mar 19, 2018 by Jorim Jaggi Committed by Android (Google) Code Review Mar 19, 2018

Merge "Fix lockscreen notification launch animation" into pi-dev

parents 782e63d5 77d0f36c

packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,9 @@ public class ActivityLaunchAnimator {

		public RemoteAnimationAdapter getLaunchAnimation(
		ExpandableNotificationRow sourceNotification) {
		if (mStatusBar.getBarState() != StatusBarState.SHADE) {
		return null;
		}
		AnimationRunner animationRunner = new AnimationRunner(sourceNotification);
		return new RemoteAnimationAdapter(animationRunner, ANIMATION_DURATION,
		0 /* statusBarTransitionDelay */);

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -5044,8 +5044,11 @@ public class StatusBar extends SystemUI implements DemoMode,
		RemoteAnimationAdapter adapter = mActivityLaunchAnimator.getLaunchAnimation(
		row);
		try {
		ActivityManager.getService().registerRemoteAnimationForNextActivityStart(
		if (adapter != null) {
		ActivityManager.getService()
		.registerRemoteAnimationForNextActivityStart(
		intent.getCreatorPackage(), adapter);
		}
		launchResult = intent.sendAndReturnResult(mContext, 0, fillInIntent, null,
		null, null, getActivityOptions(adapter));
		mActivityLaunchAnimator.setLaunchResult(launchResult);

services/core/java/com/android/server/wm/AppWindowContainerController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -617,7 +617,8 @@ public class AppWindowContainerController

		if (DEBUG_STARTING_WINDOW) Slog.v(TAG_WM, "Schedule remove starting " + mContainer
		+ " startingWindow=" + mContainer.startingWindow
		+ " startingView=" + mContainer.startingSurface);
		+ " startingView=" + mContainer.startingSurface
		+ " Callers=" + Debug.getCallers(5));

		// Use the same thread to remove the window as we used to add it, as otherwise we end up
		// with things in the view hierarchy being called from different threads.

services/core/java/com/android/server/wm/AppWindowToken.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -2079,6 +2079,13 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		super.prepareSurfaces();
		}

		/**
		* @return Whether our {@link #getSurfaceControl} is currently showing.
		*/
		boolean isSurfaceShowing() {
		return mLastSurfaceShowing;
		}

		boolean isFreezingScreen() {
		return mFreezingScreen;
		}

services/core/java/com/android/server/wm/TaskSnapshotController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -247,7 +247,8 @@ class TaskSnapshotController {
		// Ensure at least one window for the top app is visible before attempting to take
		// a screenshot. Visible here means that the WSA surface is shown and has an alpha
		// greater than 0.
		ws -> ws.mWinAnimator != null && ws.mWinAnimator.getShown()
		ws -> (ws.mAppToken == null \|\| ws.mAppToken.isSurfaceShowing())
		&& ws.mWinAnimator != null && ws.mWinAnimator.getShown()
		&& ws.mWinAnimator.mLastAlpha > 0f, true);

		if (!hasVisibleChild) {