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
This commit is contained in:
Selim Cinek
2015-10-21 20:52:29 +00:00
committed by android-build-merger

View File

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