diff options
| author | Christoph Studer <chstuder@google.com> | 2015-01-23 17:00:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-23 17:00:00 +0000 |
| commit | b97b519808719857232e1b82a6cfd0827db4ed0c (patch) | |
| tree | 5643a8f2e78628a1f4661acd7f33fb151e78cf8b /packages/SystemUI | |
| parent | 07b87e537da3ec658235fe1d874c7dba5b4d696d (diff) | |
| parent | 9e9885e1c0b34a6284235e61b023013c1ded6468 (diff) | |
| download | frameworks_base-b97b519808719857232e1b82a6cfd0827db4ed0c.zip frameworks_base-b97b519808719857232e1b82a6cfd0827db4ed0c.tar.gz frameworks_base-b97b519808719857232e1b82a6cfd0827db4ed0c.tar.bz2 | |
am 73500edb: Merge "SysUI: Don\'t drop HUN notification when clicked" into lmp-mr1-dev
automerge: 9e9885e
* commit '9e9885e1c0b34a6284235e61b023013c1ded6468':
SysUI: Don't drop HUN notification when clicked
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 2b6ac26..3392d8e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -1549,7 +1549,11 @@ public abstract class BaseStatusBar extends SystemUI implements dismissKeyguardThenExecute(new OnDismissAction() { public boolean onDismiss() { if (mIsHeadsUp) { - mHeadsUpNotificationView.clear(); + // Release the HUN notification to the shade. + // + // In most cases, when FLAG_AUTO_CANCEL is set, the notification will + // become canceled shortly by NoMan, but we can't assume that. + mHeadsUpNotificationView.releaseAndClose(); } new Thread() { @Override |