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

Commit 8733c512 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Fix rules for exempting notifications from the expanded state. 

Bug: 175207142
Test: Post a notification with a customContentView, but not a bigCustomContentView; note that it is no longer expandable.
Change-Id: I9bf41f3313e68ddbb43485cee37911bc8cfeb012
parent d6209d4e

core/java/android/app/Notification.java

+4 −4
Original line number Diff line number Diff line
@@ -5773,11 +5773,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;

        }