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

Commit 550054fb authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Settings intent action for promoted notifs" into main

parents ead7c212 a660be4e

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -37434,6 +37434,7 @@ package android.provider { 
    field public static final String ACTION_APPLICATION_SETTINGS = "android.settings.APPLICATION_SETTINGS";

    field public static final String ACTION_APP_LOCALE_SETTINGS = "android.settings.APP_LOCALE_SETTINGS";

    field public static final String ACTION_APP_NOTIFICATION_BUBBLE_SETTINGS = "android.settings.APP_NOTIFICATION_BUBBLE_SETTINGS";

    field @FlaggedApi("android.app.api_rich_ongoing") public static final String ACTION_APP_NOTIFICATION_PROMOTION_SETTINGS = "android.settings.APP_NOTIFICATION_PROMOTION_SETTINGS";

    field public static final String ACTION_APP_NOTIFICATION_SETTINGS = "android.settings.APP_NOTIFICATION_SETTINGS";

    field public static final String ACTION_APP_OPEN_BY_DEFAULT_SETTINGS = "android.settings.APP_OPEN_BY_DEFAULT_SETTINGS";

    field public static final String ACTION_APP_SEARCH_SETTINGS = "android.settings.APP_SEARCH_SETTINGS";

core/java/android/app/NotificationManager.java

+3 −0
Original line number Diff line number Diff line
@@ -958,6 +958,9 @@ public class NotificationManager { 
     * Returns whether the calling app's properly formatted notifications can appear in a promoted

     * format, which may result in higher ranking, appearances on additional surfaces, and richer

     * presentation.

     *

     * Apps can request this permission by sending the user to the activity that matches the system

     * intent action {@link android.provider.Settings#ACTION_APP_NOTIFICATION_PROMOTION_SETTINGS}.

     */

    @FlaggedApi(android.app.Flags.FLAG_API_RICH_ONGOING)

    public boolean canPostPromotedNotifications() {

core/java/android/provider/Settings.java

+15 −0
Original line number Diff line number Diff line
@@ -2349,6 +2349,21 @@ public final class Settings { 
    public static final String ACTION_ALL_APPS_NOTIFICATION_SETTINGS_FOR_REVIEW =

            "android.settings.ALL_APPS_NOTIFICATION_SETTINGS_FOR_REVIEW";













    /**













     * Activity Action: Show the permission screen for allowing apps to post promoted notifications.













     * <p>













     *     Input: {@link #EXTRA_APP_PACKAGE}, the package to display.













     * <p>













     * In some cases, a matching Activity may not exist, so ensure you













     * safeguard against this.













     * <p>













     * Output: Nothing.













     */













    @FlaggedApi(android.app.Flags.FLAG_API_RICH_ONGOING)













    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    public static final String ACTION_APP_NOTIFICATION_PROMOTION_SETTINGS













            = "android.settings.APP_NOTIFICATION_PROMOTION_SETTINGS";



























    /**















     * Activity Action: Show notification settings for a single app.















     * <p>