Merge "Fix issue where panel wouldn't collapse" into pi-dev (a0b6b503) · Commits · e / os / android_frameworks_base

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

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,6 @@ import android.animation.Animator;
	import android.animation.AnimatorListenerAdapter;		import android.animation.AnimatorListenerAdapter;
	import android.animation.ValueAnimator;		import android.animation.ValueAnimator;
	import android.app.ActivityManager;		import android.app.ActivityManager;
	import android.app.ActivityOptions;
	import android.graphics.Matrix;		import android.graphics.Matrix;
	import android.graphics.Rect;		import android.graphics.Rect;
	import android.os.RemoteException;		import android.os.RemoteException;
	@@ -76,8 +75,8 @@ public class ActivityLaunchAnimator {
	}		}

	public RemoteAnimationAdapter getLaunchAnimation(		public RemoteAnimationAdapter getLaunchAnimation(
	ExpandableNotificationRow sourceNotification) {		ExpandableNotificationRow sourceNotification, boolean occluded) {
	if (mStatusBar.getBarState() != StatusBarState.SHADE) {		if (mStatusBar.getBarState() != StatusBarState.SHADE \|\| occluded) {
	return null;		return null;
	}		}
	AnimationRunner animationRunner = new AnimationRunner(sourceNotification);		AnimationRunner animationRunner = new AnimationRunner(sourceNotification);

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

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5058,6 +5058,7 @@ public class StatusBar extends SystemUI implements DemoMode,
	final boolean afterKeyguardGone = intent.isActivity()		final boolean afterKeyguardGone = intent.isActivity()
	&& PreviewInflater.wouldLaunchResolverActivity(mContext, intent.getIntent(),		&& PreviewInflater.wouldLaunchResolverActivity(mContext, intent.getIntent(),
	mLockscreenUserManager.getCurrentUserId());		mLockscreenUserManager.getCurrentUserId());
			final boolean wasOccluded = mIsOccluded;
	dismissKeyguardThenExecute(() -> {		dismissKeyguardThenExecute(() -> {
	// TODO: Some of this code may be able to move to NotificationEntryManager.		// TODO: Some of this code may be able to move to NotificationEntryManager.
	if (mHeadsUpManager != null && mHeadsUpManager.isHeadsUp(notificationKey)) {		if (mHeadsUpManager != null && mHeadsUpManager.isHeadsUp(notificationKey)) {
	@@ -5121,7 +5122,7 @@ public class StatusBar extends SystemUI implements DemoMode,
	remoteInputText.toString());		remoteInputText.toString());
	}		}
	RemoteAnimationAdapter adapter = mActivityLaunchAnimator.getLaunchAnimation(		RemoteAnimationAdapter adapter = mActivityLaunchAnimator.getLaunchAnimation(
	row);		row, wasOccluded);
	try {		try {
	if (adapter != null) {		if (adapter != null) {
	ActivityManager.getService()		ActivityManager.getService()
	@@ -5168,6 +5169,7 @@ public class StatusBar extends SystemUI implements DemoMode,
	if (mStatusBarKeyguardViewManager.isShowing()		if (mStatusBarKeyguardViewManager.isShowing()
	&& mStatusBarKeyguardViewManager.isOccluded()) {		&& mStatusBarKeyguardViewManager.isOccluded()) {
	mStatusBarKeyguardViewManager.addAfterKeyguardGoneRunnable(runnable);		mStatusBarKeyguardViewManager.addAfterKeyguardGoneRunnable(runnable);
			collapsePanel(true /* animate */);
	} else {		} else {
	new Thread(runnable).start();		new Thread(runnable).start();
	}		}
	@@ -5252,7 +5254,7 @@ public class StatusBar extends SystemUI implements DemoMode,
	int launchResult = TaskStackBuilder.create(mContext)		int launchResult = TaskStackBuilder.create(mContext)
	.addNextIntentWithParentStack(intent)		.addNextIntentWithParentStack(intent)
	.startActivities(getActivityOptions(		.startActivities(getActivityOptions(
	mActivityLaunchAnimator.getLaunchAnimation(row)),		mActivityLaunchAnimator.getLaunchAnimation(row, mIsOccluded)),
	new UserHandle(UserHandle.getUserId(appUid)));		new UserHandle(UserHandle.getUserId(appUid)));
	mActivityLaunchAnimator.setLaunchResult(launchResult);		mActivityLaunchAnimator.setLaunchResult(launchResult);
	if (shouldCollapse()) {		if (shouldCollapse()) {