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

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

Merge "Add FingerprintEnroll API"

parents 97868f23 83ff28c0

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35074,6 +35074,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";

    field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";

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

    field public static final java.lang.String ACTION_FINGERPRINT_ENROLL = "android.settings.FINGERPRINT_ENROLL";

    field public static final java.lang.String ACTION_HARD_KEYBOARD_SETTINGS = "android.settings.HARD_KEYBOARD_SETTINGS";

    field public static final java.lang.String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS";

    field public static final java.lang.String ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS = "android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -38138,6 +38138,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";

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

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

    field public static final java.lang.String ACTION_FINGERPRINT_ENROLL = "android.settings.FINGERPRINT_ENROLL";

    field public static final java.lang.String ACTION_HARD_KEYBOARD_SETTINGS = "android.settings.HARD_KEYBOARD_SETTINGS";

    field public static final java.lang.String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS";

    field public static final java.lang.String ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS = "android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35345,6 +35345,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";

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

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

    field public static final java.lang.String ACTION_FINGERPRINT_ENROLL = "android.settings.FINGERPRINT_ENROLL";

    field public static final java.lang.String ACTION_HARD_KEYBOARD_SETTINGS = "android.settings.HARD_KEYBOARD_SETTINGS";

    field public static final java.lang.String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS";

    field public static final java.lang.String ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS = "android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS";

core/java/android/provider/Settings.java

+12 −0
Original line number Diff line number Diff line
@@ -441,6 +441,18 @@ public final class Settings { 
    public static final String ACTION_ASSIST_GESTURE_SETTINGS =

            "android.settings.ASSIST_GESTURE_SETTINGS";



    /**

     * Activity Action: Show settings to enroll fingerprints, and setup PIN/Pattern/Pass if

     * necessary.

     * <p>

     * Input: Nothing.

     * <p>

     * Output: Nothing.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_FINGERPRINT_ENROLL =

            "android.settings.FINGERPRINT_ENROLL";



    /**

     * Activity Action: Show settings to allow configuration of cast endpoints.

     * <p>