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

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

Merge "New API: Settings.ACTION_REQUEST_ENABLE_CONTENT_CAPTURE"

parents b651c385 8b432642

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5943,6 +5943,7 @@ package android.provider { 
  public final class Settings {

    field public static final String ACTION_ENTERPRISE_PRIVACY_SETTINGS = "android.settings.ENTERPRISE_PRIVACY_SETTINGS";

    field public static final String ACTION_LOCATION_CONTROLLER_EXTRA_PACKAGE_SETTINGS = "android.settings.LOCATION_CONTROLLER_EXTRA_PACKAGE_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";

  }

































api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -1815,6 +1815,7 @@ package android.provider {





























  public final class Settings {















    field public static final String ACTION_ENTERPRISE_PRIVACY_SETTINGS = "android.settings.ENTERPRISE_PRIVACY_SETTINGS";













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















    field public static final int RESET_MODE_PACKAGE_DEFAULTS = 1; // 0x1















  }

















































core/java/android/provider/Settings.java



+24
−0




























Original line number
Diff line number
Diff line








@@ -1657,6 +1657,30 @@ public final class Settings {













    public static final String ACTION_STORAGE_VOLUME_ACCESS_SETTINGS =















            "android.settings.STORAGE_VOLUME_ACCESS_SETTINGS";







































    /**













     * Activity Action: Show screen that let user select enable (or disable) Content Capture.













     * <p>













     * Input: Nothing.













     *













     * <p>













     * Output: {@link android.app.Activity#RESULT_OK} if user enabled Content Capture,













     * {@link android.app.Activity#RESULT_CANCELED} if user disabled it, cancelled, or if the caller













     * is not the Content Capture service associated with the user.













     *













     * <p>













     * <b>NOTE: </b> Caller should call













     * {@link android.view.contentcapture.ContentCaptureManager#isContentCaptureFeatureEnabled()}













     * first to check whether the feature is already enabled.













     *













     * @hide













     */













    @SystemApi













    @TestApi













    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    public static final String ACTION_REQUEST_ENABLE_CONTENT_CAPTURE =













            "android.settings.REQUEST_ENABLE_CONTENT_CAPTURE";



























    // End of Intent actions for Settings





























    /**