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

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

Merge "Correct capitalization of string constant." into main

parents 923cd35c f1d9e2ac
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -6599,7 +6599,7 @@ package android.app {
    field public static final String EXTRA_PROGRESS_MAX = "android.progressMax";
    field public static final String EXTRA_REMOTE_INPUT_DRAFT = "android.remoteInputDraft";
    field public static final String EXTRA_REMOTE_INPUT_HISTORY = "android.remoteInputHistory";
    field @FlaggedApi("android.app.opt_in_rich_ongoing") public static final String EXTRA_REQUEST_PROMOTED_ONGOING = "android.REQUEST_PROMOTED_ONGOING";
    field @FlaggedApi("android.app.opt_in_rich_ongoing") public static final String EXTRA_REQUEST_PROMOTED_ONGOING = "android.requestPromotedOngoing";
    field @Deprecated public static final String EXTRA_SELF_DISPLAY_NAME = "android.selfDisplayName";
    field public static final String EXTRA_SHOW_BIG_PICTURE_WHEN_COLLAPSED = "android.showBigPictureWhenCollapsed";
    field public static final String EXTRA_SHOW_CHRONOMETER = "android.showChronometer";
+8 −7
Original line number Diff line number Diff line
@@ -234,13 +234,6 @@ public class Notification implements Parcelable
     */
    public static final String EXTRA_NOTIFICATION_ID = "android.intent.extra.NOTIFICATION_ID";
    /**
     * Optional extra for {@link Notification}. If provided, should contain a boolean indicating
     * whether the notification is requesting promoted treatment.
     */
    @FlaggedApi(Flags.FLAG_OPT_IN_RICH_ONGOING)
    public static final String EXTRA_REQUEST_PROMOTED_ONGOING = "android.REQUEST_PROMOTED_ONGOING";
    /**
     * Use all default values (where applicable).
     */
@@ -1735,6 +1728,13 @@ public class Notification implements Parcelable
    @FlaggedApi(Flags.FLAG_API_RICH_ONGOING)
    public static final String EXTRA_PROGRESS_END_ICON = "android.progressEndIcon";
    /**
     * {@link #extras} key: If provided, should contain a boolean indicating
     * whether the notification is requesting promoted treatment.
     */
    @FlaggedApi(Flags.FLAG_OPT_IN_RICH_ONGOING)
    public static final String EXTRA_REQUEST_PROMOTED_ONGOING = "android.requestPromotedOngoing";
    /**
     * @hide
     */
@@ -1796,6 +1796,7 @@ public class Notification implements Parcelable
     */
    public static final String EXTRA_SUMMARIZED_CONTENT = "android.summarization";
    @UnsupportedAppUsage
    private Icon mSmallIcon;
    @UnsupportedAppUsage