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

Commit 6b158b32 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Prototype making expanded notification states optional again" into main

parents f1413f13 bc851802

core/java/android/app/Notification.java

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

        @SuppressWarnings("AndroidFrameworkCompatChange")

        private boolean bigContentViewRequired() {

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

            if (!Flags.notificationExpansionOptional()

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

                return true;

            }

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

core/java/android/app/notification.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -59,6 +59,13 @@ flag { 
  bug: "335211019"

}



flag {

  name: "notification_expansion_optional"

  namespace: "systemui"

  description: "Experiment to restore the pre-S behavior where standard notifications are not expandable unless they have actions."

  bug: "339523906"

}



flag {

  name: "keyguard_private_notifications"

  namespace: "systemui"