diff options
| author | 2020-10-13 06:02:10 +0000 | |
|---|---|---|
| committer | 2020-10-13 06:02:10 +0000 | |
| commit | 168d7918b807477084a84cb365d0d72d45cfdd9a (patch) | |
| tree | 780ab7084fd6ca082f046359b566641392552867 | |
| parent | 558cee47d3555195a144b1bda20256e19eccc551 (diff) | |
| parent | 9a9471290f3d98bd908025159ae993971b3474ef (diff) | |
Merge "Adds Magnification settings keys as TestApi"
| -rw-r--r-- | api/test-current.txt | 5 | ||||
| -rw-r--r-- | api/test-lint-baseline.txt | 10 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 5 |
3 files changed, 20 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 76663378caf1..0bdc6c6901a9 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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"; diff --git a/api/test-lint-baseline.txt b/api/test-lint-baseline.txt index 91a09e3d8890..a314702b7792 100644 --- a/api/test-lint-baseline.txt +++ b/api/test-lint-baseline.txt @@ -2530,6 +2530,16 @@ NoSettingsProvider: android.provider.Settings.Global#TETHER_OFFLOAD_DISABLED: 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: diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 7df9a5fc7a51..8ad76692db04 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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"; |