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

Merge "Fix DirectReply bug when reapply fails" into nyc-dev

Browse Source
This commit is contained in:
Adrian Roos
2016-06-01 19:41:46 +00:00
committed by Android (Google) Code Review
parent 65f1973ba9 0789ee0908
commit 6510bdeada
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
View File

@@ -277,15 +277,25 @@ public class NotificationContentView extends FrameLayout {
mContractedChild.animate().cancel(); mContractedChild.animate().cancel();
removeView(mContractedChild); removeView(mContractedChild);
} }
mPreviousExpandedRemoteInputIntent = mPreviousExpandedRemoteInputIntent = null;
mExpandedRemoteInput != null ? mExpandedRemoteInput.getPendingIntent() : null; if (mExpandedRemoteInput != null) {
mExpandedRemoteInput.onNotificationUpdateOrReset();
if (mExpandedRemoteInput.isActive()) {
mPreviousExpandedRemoteInputIntent = mExpandedRemoteInput.getPendingIntent();
}
}
if (mExpandedChild != null) { if (mExpandedChild != null) {
mExpandedChild.animate().cancel(); mExpandedChild.animate().cancel();
removeView(mExpandedChild); removeView(mExpandedChild);
mExpandedRemoteInput = null; mExpandedRemoteInput = null;
} }
mPreviousHeadsUpRemoteInputIntent = mPreviousHeadsUpRemoteInputIntent = null;
mHeadsUpRemoteInput != null ? mHeadsUpRemoteInput.getPendingIntent() : null; if (mHeadsUpRemoteInput != null) {
mHeadsUpRemoteInput.onNotificationUpdateOrReset();
if (mHeadsUpRemoteInput.isActive()) {
mPreviousHeadsUpRemoteInputIntent = mHeadsUpRemoteInput.getPendingIntent();
}
}
if (mHeadsUpChild != null) { if (mHeadsUpChild != null) {
mHeadsUpChild.animate().cancel(); mHeadsUpChild.animate().cancel();
removeView(mHeadsUpChild); removeView(mHeadsUpChild);
@@ -910,7 +920,7 @@ public class NotificationContentView extends FrameLayout {
view.findViewWithTag(RemoteInputView.VIEW_TAG); view.findViewWithTag(RemoteInputView.VIEW_TAG);
if (existing != null) { if (existing != null) {
existing.onNotificationUpdate(); existing.onNotificationUpdateOrReset();
} }
if (existing == null && hasRemoteInput) { if (existing == null && hasRemoteInput) {

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

@@ -227,7 +227,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
updateSendButton(); updateSendButton();
} }
public void onNotificationUpdate() { public void onNotificationUpdateOrReset() {
boolean sending = mProgressBar.getVisibility() == VISIBLE; boolean sending = mProgressBar.getVisibility() == VISIBLE;
if (sending) { if (sending) {