DirectReply: Fix bugs when replying from HUNs

Fixes a bug that would re-open the remote input when
it was sent while HUN'd. Also fixes a bug that would
not properly clear a notification if swiped away and
at the same time HUN'd and having a reply active.

Change-Id: I3e8b5f81eaffd8e4b8602f3dbdd025229ba201fa
Fixes: 30454772

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

@@ -1553,7 +1553,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         }
         Entry entry = mNotificationData.get(key);
 
-        if (entry != null && mRemoteInputController.isRemoteInputActive(entry)) {
+        if (entry != null && mRemoteInputController.isRemoteInputActive(entry)
+                && (entry.row != null && !entry.row.isDismissed())) {
             mLatestRankingMap = ranking;
             mRemoteInputEntriesToRemoveOnCollapse.add(entry);
             return;
@@ -2461,6 +2462,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
                             mStatusBarWindowManager.setHeadsUpShowing(false);
                             mHeadsUpManager.setHeadsUpGoingAway(false);
                         }
+                        removeRemoteInputEntriesKeptUntilCollapsed();
                     }
                 });
             }

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

@@ -348,7 +348,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
     }
 
     public boolean isActive() {
-        return mEditText.isFocused();
+        return mEditText.isFocused() && mEditText.isEnabled();
     }
 
     public void stealFocusFrom(RemoteInputView other) {