Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f83f46a authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

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

Merge "Merge "Fix DirectReply bug when reapply fails" into nyc-dev am: 6510bdea am: 053ffa6d" into nyc-mr1-dev-plus-aosp
am: b07aac4e

* commit 'b07aac4e':
  Fix DirectReply bug when reapply fails

Change-Id: I127a782f9ef492f0bd309433733df4a49b893879
parents ad6aee35 b07aac4e

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

+15 −5
Original line number Original line Diff line number Diff line
@@ -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) {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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) {