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

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

Merge "Add API for launching a rule management page" into main

parents 83b1cb7f 19aaced9

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -36760,6 +36760,7 @@ package android.provider { 
    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";

    field public static final String ACTION_APP_USAGE_SETTINGS = "android.settings.action.APP_USAGE_SETTINGS";

    field @FlaggedApi("android.app.modes_api") public static final String ACTION_AUTOMATIC_ZEN_RULE_SETTINGS = "android.settings.AUTOMATIC_ZEN_RULE_SETTINGS";

    field public static final String ACTION_AUTO_ROTATE_SETTINGS = "android.settings.AUTO_ROTATE_SETTINGS";

    field public static final String ACTION_BATTERY_SAVER_SETTINGS = "android.settings.BATTERY_SAVER_SETTINGS";

    field public static final String ACTION_BIOMETRIC_ENROLL = "android.settings.BIOMETRIC_ENROLL";
@@ -36847,6 +36848,7 @@ package android.provider { 
    field public static final String EXTRA_AIRPLANE_MODE_ENABLED = "airplane_mode_enabled";

    field public static final String EXTRA_APP_PACKAGE = "android.provider.extra.APP_PACKAGE";

    field public static final String EXTRA_AUTHORITIES = "authorities";

    field @FlaggedApi("android.app.modes_api") public static final String EXTRA_AUTOMATIC_ZEN_RULE_ID = "android.provider.extra.AUTOMATIC_ZEN_RULE_ID";

    field public static final String EXTRA_BATTERY_SAVER_MODE_ENABLED = "android.settings.extra.battery_saver_mode_enabled";

    field public static final String EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED = "android.provider.extra.BIOMETRIC_AUTHENTICATORS_ALLOWED";

    field public static final String EXTRA_CHANNEL_FILTER_LIST = "android.provider.extra.CHANNEL_FILTER_LIST";

core/java/android/app/NotificationManager.java

+3 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.os.StrictMode;

import android.os.UserHandle;

import android.provider.Settings;

import android.provider.Settings.Global;

import android.service.notification.Adjustment;

import android.service.notification.Condition;
@@ -1253,7 +1254,8 @@ public class NotificationManager { 
     * <p>

     * If this method returns true, calls to

     * {@link #updateAutomaticZenRule(String, AutomaticZenRule)} may fail and apps should defer

     * rule management to system settings/uis.

     * rule management to system settings/uis via

     * {@link Settings#ACTION_AUTOMATIC_ZEN_RULE_SETTINGS}.

     */

    @FlaggedApi(Flags.FLAG_MODES_API)

    public boolean areAutomaticZenRulesUserManaged() {

core/java/android/provider/Settings.java

+32 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.provider; 














import android.Manifest;















import android.annotation.CallbackExecutor;













import android.annotation.FlaggedApi;















import android.annotation.IntDef;















import android.annotation.IntRange;















import android.annotation.NonNull;









@@ -36,6 +37,7 @@ import android.app.ActivityThread;













import android.app.AppOpsManager;















import android.app.Application;















import android.app.AutomaticZenRule;













import android.app.Flags;















import android.app.NotificationChannel;















import android.app.NotificationManager;















import android.app.SearchManager;










@@ -1903,6 +1905,36 @@ public final class Settings {













    public static final String ACTION_CONDITION_PROVIDER_SETTINGS















            = "android.settings.ACTION_CONDITION_PROVIDER_SETTINGS";



























    /**













     * Activity Action: Shows the settings page for an {@link AutomaticZenRule} mode.













     * <p>













     * Users can change the behavior of the mode when it's activated and access the owning app's













     * additional configuration screen, where triggering criteria can be modified (see













     * {@link AutomaticZenRule#setConfigurationActivity(ComponentName)}).













     * <p>













     * A matching Activity will only be found if













     * {@link NotificationManager#areAutomaticZenRulesUserManaged()} is true.













     * <p>













     * Input: Intent's data URI set with an application name, using the "package" schema (like













     * "package:com.my.app").













     * Input: The id of the rule, provided in {@link #EXTRA_AUTOMATIC_ZEN_RULE_ID}.













     * <p>













     * Output: Nothing.













     */













    @FlaggedApi(Flags.FLAG_MODES_API)













    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    public static final String ACTION_AUTOMATIC_ZEN_RULE_SETTINGS













            = "android.settings.AUTOMATIC_ZEN_RULE_SETTINGS";

























    /**













     * Activity Extra: The String id of the {@link AutomaticZenRule mode} settings to display.













     * <p>













     * This must be passed as an extra field to the {@link #ACTION_AUTOMATIC_ZEN_RULE_SETTINGS}.













     */













    @FlaggedApi(Flags.FLAG_MODES_API)













    public static final String EXTRA_AUTOMATIC_ZEN_RULE_ID













            = "android.provider.extra.AUTOMATIC_ZEN_RULE_ID";



























    /**















     * Activity Action: Show settings for video captioning.















     * <p>