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

Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev

Browse Source 
am: dd22dcbcdf

Change-Id: I2760a5efce65ba88fcb49589eec9071fc052ddc9
This commit is contained in:
Adrian Roos
2017-07-26 11:53:34 +00:00
committed by android-build-merger
parent 9975186ae5 dd22dcbcdf
commit 6b46beea25
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,

14
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -24002,9 +24002,19 @@ 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);
mWindowManager.executeAppTransition();
// 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();