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

Commit 474a52ef authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix optional expanders logic to not require custom views" into main

parents f5f93f30 e8bb900e

core/java/android/app/Notification.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -6492,8 +6492,13 @@ public class Notification implements Parcelable 
        // visual regressions.

        // visual regressions.

        @SuppressWarnings("AndroidFrameworkCompatChange")

        @SuppressWarnings("AndroidFrameworkCompatChange")

        private boolean bigContentViewRequired() {

        private boolean bigContentViewRequired() {

            if (!Flags.notificationExpansionOptional()

            if (Flags.notificationExpansionOptional()) {

                    && mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.S) {

                // Notifications without a bigContentView, style, or actions do not need to expand

                boolean exempt = mN.bigContentView == null

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

                return !exempt;

            }

            if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.S) {

                return true;

                return true;

            }

            }

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

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