Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DirectReply: Fix bugs when replying from HUNs" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-24 23:07:30 +00:00
committed by Android (Google) Code Review
parent 8c16969c3e 9550f2e75c
commit a8cf435e81
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1610,7 +1610,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
} }
Entry entry = mNotificationData.get(key); 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; mLatestRankingMap = ranking;
mRemoteInputEntriesToRemoveOnCollapse.add(entry); mRemoteInputEntriesToRemoveOnCollapse.add(entry);
return; return;
@@ -2535,6 +2536,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
mStatusBarWindowManager.setHeadsUpShowing(false); mStatusBarWindowManager.setHeadsUpShowing(false);
mHeadsUpManager.setHeadsUpGoingAway(false); mHeadsUpManager.setHeadsUpGoingAway(false);
} }
removeRemoteInputEntriesKeptUntilCollapsed();
} }
}); });
} }

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

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