diff options
| author | Selim Cinek <cinek@google.com> | 2015-10-21 20:39:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-21 20:39:28 +0000 |
| commit | 688e046bad87cc722e8571b8f4180604623239a8 (patch) | |
| tree | 794602fb671122c73167bdec39146089eb87e25b /packages | |
| parent | 0cd10ec8cf7a896bbdfc0639bf5f9c663c46edbb (diff) | |
| parent | 2ae7107d0e9cde3e88c7313cf4dbcebbd171597e (diff) | |
| download | frameworks_base-688e046bad87cc722e8571b8f4180604623239a8.zip frameworks_base-688e046bad87cc722e8571b8f4180604623239a8.tar.gz frameworks_base-688e046bad87cc722e8571b8f4180604623239a8.tar.bz2 | |
Merge "Changing the ordering for heads up notifications" into mnc-dr-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java index 299f20e..4a95d3a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java @@ -582,6 +582,13 @@ public class HeadsUpManager implements ViewTreeObserver.OnComputeInternalInsetsL @Override public int compareTo(HeadsUpEntry o) { + boolean selfFullscreen = hasFullScreenIntent(entry); + boolean otherFullscreen = hasFullScreenIntent(o.entry); + if (selfFullscreen && !otherFullscreen) { + return -1; + } else if (!selfFullscreen && otherFullscreen) { + return 1; + } return postTime < o.postTime ? 1 : postTime == o.postTime ? entry.key.compareTo(o.entry.key) : -1; |