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

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

Merge "Make a setting intent public"

parents defa4d7c c870d6ab

api/current.txt

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

    field public static final String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";

    field public static final String ACTION_CHANNEL_NOTIFICATION_SETTINGS = "android.settings.CHANNEL_NOTIFICATION_SETTINGS";

    field public static final String ACTION_CONDITION_PROVIDER_SETTINGS = "android.settings.ACTION_CONDITION_PROVIDER_SETTINGS";

    field public static final String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";

    field public static final String ACTION_DATA_USAGE_SETTINGS = "android.settings.DATA_USAGE_SETTINGS";

    field public static final String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";

core/java/android/provider/Settings.java

+12 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.annotation.UserIdInt; 
import android.app.ActivityThread;

import android.app.AppOpsManager;

import android.app.Application;

import android.app.AutomaticZenRule;

import android.app.NotificationChannel;

import android.app.NotificationManager;

import android.app.SearchManager;
@@ -1313,7 +1314,17 @@ public final class Settings { 
            "android.settings.NOTIFICATION_POLICY_ACCESS_DETAIL_SETTINGS";















    /**













     * @hide













     * Activity Action: Show the automatic do not disturb rule listing page













     * <p>













     *     Users can add, enable, disable, and remove automatic do not disturb rules from this













     *     screen. See {@link NotificationManager#addAutomaticZenRule(AutomaticZenRule)} for more













     *     details.













     * </p>













     * <p>













     *     Input: Nothing













     *     Output: Nothing













     * </p>













     *















     */















    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)















    public static final String ACTION_CONDITION_PROVIDER_SETTINGS