commit ae070b96acc23e1e6c4ca979d72c39e0d91e583a
author Selim Cinek <cinek@google.com> Wed Oct 21 20:52:29 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 21 20:52:29 2015 +0000
tree 8ebf71b7c5e12e4bc14a8452d73d30366c8b6b01
parent c9f3b2f54b042df97a806ad114f21cca26a8341a
parent f9c4f745e6a4e8586baab085dc86b9b2b187f48a

Merge "Changing the ordering for heads up notifications" into mnc-dr-dev am: 688e046bad
am: f9c4f745e6

* commit 'f9c4f745e6a4e8586baab085dc86b9b2b187f48a':
  Changing the ordering for heads up notifications

packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java

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