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

Merge "Fix unstyled Notification RemoteViews inflation logic for apps targeting API 23 and lower." into sc-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-20 20:25:26 +00:00
committed by Android (Google) Code Review
parent 14886c5085 72ea9c6884
commit 86536be56b
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6506,25 +6506,34 @@ public class Notification implements Parcelable
if (mContext.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.N if (mContext.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.N
&& !styleDisplaysCustomViewInline()) { && !styleDisplaysCustomViewInline()) {
if (mN.contentView == null) { RemoteViews newContentView = mN.contentView;
mN.contentView = createContentView(); RemoteViews newBigContentView = mN.bigContentView;
RemoteViews newHeadsUpContentView = mN.headsUpContentView;
if (newContentView == null) {
newContentView = createContentView();
mN.extras.putInt(EXTRA_REBUILD_CONTENT_VIEW_ACTION_COUNT, mN.extras.putInt(EXTRA_REBUILD_CONTENT_VIEW_ACTION_COUNT,
mN.contentView.getSequenceNumber()); newContentView.getSequenceNumber());
} }
if (mN.bigContentView == null) { if (newBigContentView == null) {
mN.bigContentView = createBigContentView(); newBigContentView = createBigContentView();
if (mN.bigContentView != null) { if (newBigContentView != null) {
mN.extras.putInt(EXTRA_REBUILD_BIG_CONTENT_VIEW_ACTION_COUNT, mN.extras.putInt(EXTRA_REBUILD_BIG_CONTENT_VIEW_ACTION_COUNT,
mN.bigContentView.getSequenceNumber()); newBigContentView.getSequenceNumber());
} }
} }
if (mN.headsUpContentView == null) { if (newHeadsUpContentView == null) {
mN.headsUpContentView = createHeadsUpContentView(); newHeadsUpContentView = createHeadsUpContentView();
if (mN.headsUpContentView != null) { if (newHeadsUpContentView != null) {
mN.extras.putInt(EXTRA_REBUILD_HEADS_UP_CONTENT_VIEW_ACTION_COUNT, mN.extras.putInt(EXTRA_REBUILD_HEADS_UP_CONTENT_VIEW_ACTION_COUNT,
mN.headsUpContentView.getSequenceNumber()); newHeadsUpContentView.getSequenceNumber());
} }
} }
// Don't set any of the content views until after they have all been generated,
// to avoid the generated .contentView triggering the logic which skips generating
// the .bigContentView.
mN.contentView = newContentView;
mN.bigContentView = newBigContentView;
mN.headsUpContentView = newHeadsUpContentView;
} }
if ((mN.defaults & DEFAULT_LIGHTS) != 0) { if ((mN.defaults & DEFAULT_LIGHTS) != 0) {