Merge "Merge "Fix DirectReply bug when reapply fails" into nyc-dev am:... (b07aac4e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java

+15 −5

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

		if (existing != null) {
		existing.onNotificationUpdate();
		existing.onNotificationUpdateOrReset();
		}

		if (existing == null && hasRemoteInput) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -227,7 +227,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
		updateSendButton();
		}

		public void onNotificationUpdate() {
		public void onNotificationUpdateOrReset() {
		boolean sending = mProgressBar.getVisibility() == VISIBLE;

		if (sending) {