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

Merge "Remove a vestige of the reply action."

Browse Source
This commit is contained in:
Jeff DeCew
2021-01-26 14:19:10 +00:00
committed by Android (Google) Code Review
parent 59e4441146 ee877e5c67
commit a56851a0bf
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}