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

Commit 0e9d54b6 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Fix rules for exempting notifications from the expanded state." into sc-dev am: 269093b8 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf48945bff9e6ebeb5e655e79689d458f0b4278c
parents ea0c58e0 269093b8

core/java/android/app/Notification.java

+4 −4
Original line number Diff line number Diff line
@@ -5803,11 +5803,11 @@ public class Notification implements Parcelable 
            if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.S) {

                return true;

            }

            // If the big content view has no content, we can exempt the app from having to show it.

            // Notifications with contentView and without a bigContentView, style, or actions would

            // not have an expanded state before S, so showing the standard template expanded state

            // usually looks wrong, so we keep it simple and don't show the expanded state.

            boolean exempt = mN.contentView != null && mN.bigContentView == null

                    && mStyle == null && mActions.size() == 0

                    && mN.extras.getCharSequence(EXTRA_TITLE) == null

                    && mN.extras.getCharSequence(EXTRA_TEXT) == null;

                    && mStyle == null && mActions.size() == 0;

            return !exempt;

        }