Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix typo in Notification.java" into udc-dev

Browse Source
This commit is contained in:
Lyn Han
2023-02-24 17:43:42 +00:00
committed by Android (Google) Code Review
parent ee9fd9031e 0e19d1df50
commit 670778a1e6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/app/Notification.java
View File

@@ -5758,7 +5758,7 @@ public class Notification implements Parcelable
List<Notification.Action> nonContextualActions = getNonContextualActions(); List<Notification.Action> nonContextualActions = getNonContextualActions();
int numActions = Math.min(nonContextualActions.size(), MAX_ACTION_BUTTONS); int numActions = Math.min(nonContextualActions.size(), MAX_ACTION_BUTTONS);
boolean emphazisedMode = mN.fullScreenIntent != null boolean emphasizedMode = mN.fullScreenIntent != null
|| p.mCallStyleActions || p.mCallStyleActions
|| ((mN.flags & FLAG_FSI_REQUESTED_BUT_DENIED) != 0); || ((mN.flags & FLAG_FSI_REQUESTED_BUT_DENIED) != 0);
@@ -5771,7 +5771,7 @@ public class Notification implements Parcelable
big.setInt(R.id.actions, "setCollapsibleIndentDimen", big.setInt(R.id.actions, "setCollapsibleIndentDimen",
R.dimen.call_notification_collapsible_indent); 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) { if (numActions > 0 && !p.mHideActions) {
big.setViewVisibility(R.id.actions_container, View.VISIBLE); big.setViewVisibility(R.id.actions_container, View.VISIBLE);
big.setViewVisibility(R.id.actions, View.VISIBLE); big.setViewVisibility(R.id.actions, View.VISIBLE);
@@ -5783,12 +5783,12 @@ public class Notification implements Parcelable
boolean actionHasValidInput = hasValidRemoteInput(action); boolean actionHasValidInput = hasValidRemoteInput(action);
validRemoteInput |= actionHasValidInput; validRemoteInput |= actionHasValidInput;
final RemoteViews button = generateActionButton(action, emphazisedMode, p); final RemoteViews button = generateActionButton(action, emphasizedMode, p);
if (actionHasValidInput && !emphazisedMode) { if (actionHasValidInput && !emphasizedMode) {
// Clear the drawable // Clear the drawable
button.setInt(R.id.action0, "setBackgroundResource", 0); 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. // Clear start margin from non-first buttons to reduce the gap between them.
// (8dp remaining gap is from all buttons' standard 4dp inset). // (8dp remaining gap is from all buttons' standard 4dp inset).
button.setViewLayoutMarginDimen(R.id.action0, RemoteViews.MARGIN_START, 0); button.setViewLayoutMarginDimen(R.id.action0, RemoteViews.MARGIN_START, 0);