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

Commit 168d7918 authored by Minche Li's avatar Minche Li Committed by Android (Google) Code Review
Browse files

Merge "Adds Magnification settings keys as TestApi"

parents 558cee47 9a947129

api/test-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -3487,6 +3487,11 @@ package android.provider { 
  public static final class Settings.Secure extends android.provider.Settings.NameValueTable {

    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void resetToDefaults(@NonNull android.content.ContentResolver, @Nullable String);

    field public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED = "accessibility_display_magnification_enabled";

    field public static final String ACCESSIBILITY_MAGNIFICATION_CAPABILITY = "accessibility_magnification_capability";

    field public static final String ACCESSIBILITY_MAGNIFICATION_MODE = "accessibility_magnification_mode";

    field public static final int ACCESSIBILITY_MAGNIFICATION_MODE_ALL = 3; // 0x3

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

    field public static final int ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW = 2; // 0x2

    field public static final String ACCESSIBILITY_SHORTCUT_TARGET_SERVICE = "accessibility_shortcut_target_service";

    field public static final String ANR_SHOW_BACKGROUND = "anr_show_background";

    field public static final String AUTOFILL_FEATURE_FIELD_CLASSIFICATION = "autofill_field_classification";

api/test-lint-baseline.txt

+10 −0
Original line number Diff line number Diff line
@@ -2531,6 +2531,16 @@ NoSettingsProvider: android.provider.Settings.Global#USE_OPEN_WIFI_PACKAGE: 
    

NoSettingsProvider: android.provider.Settings.Secure#ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED:



NoSettingsProvider: android.provider.Settings.Secure#ACCESSIBILITY_MAGNIFICATION_CAPABILITY:



NoSettingsProvider: android.provider.Settings.Secure#ACCESSIBILITY_MAGNIFICATION_MODE:



NoSettingsProvider: android.provider.Settings.Secure#ACCESSIBILITY_MAGNIFICATION_MODE_ALL:



NoSettingsProvider: android.provider.Settings.Secure#ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN:



NoSettingsProvider: android.provider.Settings.Secure#ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW:

    

NoSettingsProvider: android.provider.Settings.Secure#ACCESSIBILITY_SHORTCUT_TARGET_SERVICE:

    

NoSettingsProvider: android.provider.Settings.Secure#AUTOFILL_FEATURE_FIELD_CLASSIFICATION:

core/java/android/provider/Settings.java

+5 −0
Original line number Diff line number Diff line
@@ -9088,6 +9088,7 @@ public final class Settings { 
         * @see#ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW

         * @hide

         */

        @TestApi

        public static final String ACCESSIBILITY_MAGNIFICATION_MODE =

                "accessibility_magnification_mode";









@@ -9095,12 +9096,14 @@ public final class Settings {













         * Magnification mode value that magnifies whole display.















         * @hide















         */













        @TestApi















        public static final int ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN = 0x1;





























        /**















         * Magnification mode value that magnifies magnify particular region in a window















         * @hide















         */













        @TestApi















        public static final int ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW = 0x2;





























        /**









@@ -9108,6 +9111,7 @@ public final class Settings {













         * region in a window.















         * @hide















         */













        @TestApi















        public static final int ACCESSIBILITY_MAGNIFICATION_MODE_ALL = 0x3;





























        /**









@@ -9119,6 +9123,7 @@ public final class Settings {













         * @see#ACCESSIBILITY_MAGNIFICATION_MODE_ALL















         * @hide















         */













        @TestApi















        public static final String ACCESSIBILITY_MAGNIFICATION_CAPABILITY =















                "accessibility_magnification_capability";