Merge "Keep HUNs that have an active remote input" into nyc-dev

2016-04-14 01:23:04 +00:00
parent 2cde05c3bb e211f57e2a
commit e6036ad094
1 changed files with 7 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java
@@ -674,6 +674,13 @@ public class HeadsUpManager implements ViewTreeObserver.OnComputeInternalInsetsL
            } else if (!selfFullscreen && otherFullscreen) {
                return 1;
            }
+
+            if (remoteInputActive && !o.remoteInputActive) {
+                return -1;
+            } else if (!remoteInputActive && o.remoteInputActive) {
+                return 1;
+            }
+
            return postTime < o.postTime ? 1
                    : postTime == o.postTime ? entry.key.compareTo(o.entry.key)
                            : -1;