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

Commit fb8509a3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Create setting screen from Notification Assistant"

parents 370b0da0 171f40d8

api/current.txt

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

    field public static final String ACTION_NFC_SETTINGS = "android.settings.NFC_SETTINGS";

    field public static final String ACTION_NIGHT_DISPLAY_SETTINGS = "android.settings.NIGHT_DISPLAY_SETTINGS";

    field public static final String ACTION_NOTIFICATION_ASSISTANT_SETTINGS = "android.settings.NOTIFICATION_ASSISTANT_SETTINGS";

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

    field public static final String ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS = "android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS";

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

core/java/android/provider/Settings.java

+15 −0
Original line number Diff line number Diff line
@@ -1203,6 +1203,21 @@ public final class Settings { 
    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS";













    /**













     * Activity Action: Show Notification assistant settings.













     * <p>













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













     * safeguard against this.













     * <p>













     * Input: Nothing.













     * <p>













     * Output: Nothing.













     * @see android.service.notification.NotificationAssistantService













     */













    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    public static final String ACTION_NOTIFICATION_ASSISTANT_SETTINGS =













            "android.settings.NOTIFICATION_ASSISTANT_SETTINGS";



























    /**















     * Activity Action: Show Notification listener settings.















     * <p>

































core/proto/android/app/settings_enums.proto



+4
−0




























Original line number
Diff line number
Diff line








@@ -1622,6 +1622,10 @@ enum PageId {













    // OPEN: Settings > Apps > Default Apps > Default sms















    DEFAULT_SMS_PICKER = 789;





























    // OPEN: Settings > Apps > Notification > Notification Assistant













    DEFAULT_NOTIFICATION_ASSISTANT = 790;











































    // OPEN: Settings > Apps > Default Apps > Warning dialog to confirm selection















    DEFAULT_APP_PICKER_CONFIRMATION_DIALOG = 791;

















































proto/src/metrics_constants/metrics_constants.proto



+1
−1




























Original line number
Diff line number
Diff line








@@ -3595,7 +3595,7 @@ message MetricsEvent {













    // OPEN: Settings > Apps > Default Apps > Default sms















    DEFAULT_SMS_PICKER = 789;





























    // OPEN: Settings > Apps > Default Apps > Default notification assistant













    // OPEN: Settings > Apps > Notification > Notification Assistant















    DEFAULT_NOTIFICATION_ASSISTANT = 790;































    // OPEN: Settings > Apps > Default Apps > Warning dialog to confirm selection

































services/core/java/com/android/server/notification/NotificationManagerService.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -594,8 +594,6 @@ public class NotificationManagerService extends SystemService {













            mConditionProviders.migrateToXml();















            handleSavePolicyFile();















        }



























        mAssistants.ensureAssistant();















    }































    private void loadPolicyFile() {