Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue where panel wouldn't collapse" into pi-dev

Browse Source 
am: a0b6b5033d

Change-Id: I280773ee8b95388baf3496b59dbc2fbc709a6d22
This commit is contained in:
Lucas Dupin
2018-05-15 19:36:57 -07:00
committed by android-build-merger
parent a9c4d51be4 a0b6b5033d
commit 138b13d2bf
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

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

@@ -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()) {