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

Commit 991a9dfd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add an intent action for Non-payment NFC services settings" into main

parents 9a9dae8a 403343db

core/api/system-current.txt

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

    field public static final String ACTION_MANAGE_DOMAIN_URLS = "android.settings.MANAGE_DOMAIN_URLS";

    field public static final String ACTION_MANAGE_MORE_DEFAULT_APPS_SETTINGS = "android.settings.MANAGE_MORE_DEFAULT_APPS_SETTINGS";

    field @FlaggedApi("android.nfc.nfc_action_manage_services_settings") public static final String ACTION_MANAGE_OTHER_NFC_SERVICES_SETTINGS = "android.settings.MANAGE_OTHER_NFC_SERVICES_SETTINGS";

    field public static final String ACTION_NOTIFICATION_POLICY_ACCESS_DETAIL_SETTINGS = "android.settings.NOTIFICATION_POLICY_ACCESS_DETAIL_SETTINGS";

    field public static final String ACTION_REQUEST_ENABLE_CONTENT_CAPTURE = "android.settings.REQUEST_ENABLE_CONTENT_CAPTURE";

    field public static final String ACTION_SHOW_ADMIN_SUPPORT_DETAILS = "android.settings.SHOW_ADMIN_SUPPORT_DETAILS";

core/java/android/provider/Settings.java

+20 −0
Original line number Diff line number Diff line
@@ -2255,6 +2255,26 @@ public final class Settings { 
    public static final String ACTION_MANAGE_MORE_DEFAULT_APPS_SETTINGS =

            "android.settings.MANAGE_MORE_DEFAULT_APPS_SETTINGS";













    /**













     * Activity Action: Show Other NFC services settings.













     * <p>













     * If a Settings activity handles this intent action, an "Other NFC services" entry will be













     * shown in the Default payment app settings, and clicking it will launch that activity.













     * <p>













     * In some cases, a matching Activity may not exist, so ensure you safeguard against this.













     * <p>













     * Input: Nothing.













     * <p>













     * Output: Nothing.













     *













     * @hide













     */













    @FlaggedApi(android.nfc.Flags.FLAG_NFC_ACTION_MANAGE_SERVICES_SETTINGS)













    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    @SystemApi













    public static final String ACTION_MANAGE_OTHER_NFC_SERVICES_SETTINGS =













            "android.settings.MANAGE_OTHER_NFC_SERVICES_SETTINGS";



























    /**















     * Activity Action: Show app screen size list settings for user to override app aspect















     * ratio.

































nfc/java/android/nfc/flags.aconfig



+7
−0




























Original line number
Diff line number
Diff line








@@ -125,3 +125,10 @@ flag {













    bug: "321310044"















}





























flag {













    name: "nfc_action_manage_services_settings"













    is_exported: true













    namespace: "nfc"













    description: "Add Settings.ACTION_MANAGE_OTHER_NFC_SERVICES_SETTINGS"













    bug: "358129872"













}