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

Commit 317b824a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix unstyled Notification RemoteViews inflation logic for apps... 

Merge "Fix unstyled Notification RemoteViews inflation logic for apps targeting API 23 and lower." into sc-qpr1-dev am: 86536be5 am: 28d37ec3

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

Change-Id: I00f2f20c57970ffc4319a3abf2e76056ff88bf19
parents 0c0cf888 28d37ec3

core/java/android/app/Notification.java

+20 −11
Original line number Diff line number Diff line
@@ -6506,25 +6506,34 @@ public class Notification implements Parcelable 


            if (mContext.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.N

                    && !styleDisplaysCustomViewInline()) {

                if (mN.contentView == null) {

                    mN.contentView = createContentView();

                RemoteViews newContentView = mN.contentView;

                RemoteViews newBigContentView = mN.bigContentView;

                RemoteViews newHeadsUpContentView = mN.headsUpContentView;

                if (newContentView == null) {

                    newContentView = createContentView();

                    mN.extras.putInt(EXTRA_REBUILD_CONTENT_VIEW_ACTION_COUNT,

                            mN.contentView.getSequenceNumber());

                            newContentView.getSequenceNumber());

                }

                if (mN.bigContentView == null) {

                    mN.bigContentView = createBigContentView();

                    if (mN.bigContentView != null) {

                if (newBigContentView == null) {

                    newBigContentView = createBigContentView();

                    if (newBigContentView != null) {

                        mN.extras.putInt(EXTRA_REBUILD_BIG_CONTENT_VIEW_ACTION_COUNT,

                                mN.bigContentView.getSequenceNumber());

                                newBigContentView.getSequenceNumber());

                    }

                }

                if (mN.headsUpContentView == null) {

                    mN.headsUpContentView = createHeadsUpContentView();

                    if (mN.headsUpContentView != null) {

                if (newHeadsUpContentView == null) {

                    newHeadsUpContentView = createHeadsUpContentView();

                    if (newHeadsUpContentView != null) {

                        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) {