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

Commit c2b21046 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Fix action container visibility" into nyc-dev

parents 30db6d93 7052de55

core/java/android/app/Notification.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -3197,6 +3197,7 @@ public class Notification implements Parcelable 
        }

        }





        private void resetStandardTemplateWithActions(RemoteViews big) {

        private void resetStandardTemplateWithActions(RemoteViews big) {

            big.setViewVisibility(R.id.actions_container, View.GONE);

            big.setViewVisibility(R.id.actions, View.GONE);

            big.setViewVisibility(R.id.actions, View.GONE);

            big.removeAllViews(R.id.actions);

            big.removeAllViews(R.id.actions);
@@ -3218,6 +3219,7 @@ public class Notification implements Parcelable 




            int N = mActions.size();

            int N = mActions.size();

            if (N > 0) {

            if (N > 0) {

                big.setViewVisibility(R.id.actions_container, View.VISIBLE);

                big.setViewVisibility(R.id.actions, View.VISIBLE);

                big.setViewVisibility(R.id.actions, View.VISIBLE);

                if (N>MAX_ACTION_BUTTONS) N=MAX_ACTION_BUTTONS;

                if (N>MAX_ACTION_BUTTONS) N=MAX_ACTION_BUTTONS;

                for (int i=0; i<N; i++) {

                for (int i=0; i<N; i++) {