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

am: e6036ad

* commit 'e6036ad09417edc2a0786237824eff306d1ca1bb':
  Keep HUNs that have an active remote input

Change-Id: Ia4ebbfc9f2f1dc6ad45f89a5f0c60ff8893569c0

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;