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

Commit 5bb3ee11 authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Fix typo in Notification.java" into udc-dev am: 670778a1 am: de8ea019 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21549559



Change-Id: I9a7f12a780de058dbc74d0189180e86f59265306
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7e0ae2da de8ea019

core/java/android/app/Notification.java

+5 −5
Original line number Diff line number Diff line
@@ -5758,7 +5758,7 @@ public class Notification implements Parcelable 
            List<Notification.Action> nonContextualActions = getNonContextualActions();















            int numActions = Math.min(nonContextualActions.size(), MAX_ACTION_BUTTONS);













            boolean emphazisedMode = mN.fullScreenIntent != null













            boolean emphasizedMode = mN.fullScreenIntent != null















                    || p.mCallStyleActions















                    || ((mN.flags & FLAG_FSI_REQUESTED_BUT_DENIED) != 0);























@@ -5771,7 +5771,7 @@ public class Notification implements Parcelable













                big.setInt(R.id.actions, "setCollapsibleIndentDimen",















                        R.dimen.call_notification_collapsible_indent);















            }













            big.setBoolean(R.id.actions, "setEmphasizedMode", emphazisedMode);













            big.setBoolean(R.id.actions, "setEmphasizedMode", emphasizedMode);















            if (numActions > 0 && !p.mHideActions) {















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















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









@@ -5783,12 +5783,12 @@ public class Notification implements Parcelable













                    boolean actionHasValidInput = hasValidRemoteInput(action);















                    validRemoteInput |= actionHasValidInput;



























                    final RemoteViews button = generateActionButton(action, emphazisedMode, p);













                    if (actionHasValidInput && !emphazisedMode) {













                    final RemoteViews button = generateActionButton(action, emphasizedMode, p);













                    if (actionHasValidInput && !emphasizedMode) {















                        // Clear the drawable















                        button.setInt(R.id.action0, "setBackgroundResource", 0);















                    }













                    if (emphazisedMode && i > 0) {













                    if (emphasizedMode && i > 0) {















                        // Clear start margin from non-first buttons to reduce the gap between them.















                        //  (8dp remaining gap is from all buttons' standard 4dp inset).















                        button.setViewLayoutMarginDimen(R.id.action0, RemoteViews.MARGIN_START, 0);