Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev (6b46beea) · Commits · e / os / android_frameworks_base

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

+9 −3

Original line number	Diff line number	Diff line
		@@ -6810,7 +6810,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		}
		});

		final boolean keyguardShowing = mStatusBarKeyguardViewManager.isShowing();
		final boolean afterKeyguardGone = intent.isActivity()
		&& PreviewInflater.wouldLaunchResolverActivity(mContext, intent.getIntent(),
		mCurrentUserId);
		@@ -6837,7 +6836,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		}
		}
		final StatusBarNotification parentToCancelFinal = parentToCancel;
		new Thread() {
		final Runnable runnable = new Runnable() {
		@Override
		public void run() {
		try {
		@@ -6909,7 +6908,14 @@ public class StatusBar extends SystemUI implements DemoMode,
		});
		}
		}
		}.start();
		};

		if (mStatusBarKeyguardViewManager.isShowing()
		&& mStatusBarKeyguardViewManager.isOccluded()) {
		mStatusBarKeyguardViewManager.addAfterKeyguardGoneRunnable(runnable);
		} else {
		new Thread(runnable).start();
		}

		// close the shade if it was open
		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,

+12 −2

Original line number	Diff line number	Diff line
		@@ -24002,10 +24002,20 @@ public class ActivityManagerService extends IActivityManager.Stub

		// We might change the visibilities here, so prepare an empty app transition which
		// might be overridden later if we actually change visibilities.
		mWindowManager.prepareAppTransition(TRANSIT_NONE, false /* alwaysKeepCurrent */);
		final boolean wasTransitionSet =
		mWindowManager.getPendingAppTransition() != TRANSIT_NONE;
		if (!wasTransitionSet) {
		mWindowManager.prepareAppTransition(TRANSIT_NONE,
		false /* alwaysKeepCurrent */);
		}
		mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);

		// If there was a transition set already we don't want to interfere with it as we
		// might be starting it too early.
		if (!wasTransitionSet) {
		mWindowManager.executeAppTransition();
		}
		}
		if (callback != null) {
		callback.run();
		}