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

Commit a56851a0 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Remove a vestige of the reply action."

parents 59e44411 ee877e5c

core/java/android/app/Notification.java

+4 −11
Original line number Diff line number Diff line
@@ -3589,11 +3589,6 @@ public class Notification implements Parcelable 
        private int mSecondaryTextColor = COLOR_INVALID;

        private int mBackgroundColor = COLOR_INVALID;

        private int mForegroundColor = COLOR_INVALID;

        /**

         * A temporary location where actions are stored. If != null the view originally has action

         * but doesn't have any for this inflation.

         */

        private ArrayList<Action> mOriginalActions;

        private boolean mRebuildStyledRemoteViews;



        private boolean mTintActionButtons;
@@ -7407,11 +7402,10 @@ public class Notification implements Parcelable 
        @Override

        public RemoteViews makeContentView(boolean increasedHeight) {

            if (increasedHeight) {

                mBuilder.mOriginalActions = mBuilder.mActions;

                ArrayList<Action> originalActions = mBuilder.mActions;

                mBuilder.mActions = new ArrayList<>();

                RemoteViews remoteViews = makeBigContentView();

                mBuilder.mActions = mBuilder.mOriginalActions;

                mBuilder.mOriginalActions = null;

                mBuilder.mActions = originalActions;

                return remoteViews;

            }

            return super.makeContentView(increasedHeight);
@@ -7906,12 +7900,11 @@ public class Notification implements Parcelable 
         */

        @Override

        public RemoteViews makeContentView(boolean increasedHeight) {

            mBuilder.mOriginalActions = mBuilder.mActions;

            ArrayList<Action> originalActions = mBuilder.mActions;

            mBuilder.mActions = new ArrayList<>();

            RemoteViews remoteViews = makeMessagingView(true /* isCollapsed */,

                    false /* hideLargeIcon */);

            mBuilder.mActions = mBuilder.mOriginalActions;

            mBuilder.mOriginalActions = null;

            mBuilder.mActions = originalActions;

            return remoteViews;

        }