From 9a9471290f3d98bd908025159ae993971b3474ef Mon Sep 17 00:00:00 2001 From: mincheli Date: Thu, 6 Aug 2020 16:52:42 +0800 Subject: [PATCH] Adds Magnification settings keys as TestApi Bug: 162814440 Test: atest SettingsProviderTest Change-Id: If3ddc65ebbfd679892d89a273a84edac78bc0cb6 --- api/test-current.txt | 5 +++++ api/test-lint-baseline.txt | 10 ++++++++++ core/java/android/provider/Settings.java | 5 +++++ 3 files changed, 20 insertions(+) diff --git a/api/test-current.txt b/api/test-current.txt index 25a471086409a..91f1490d83f2b 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3400,6 +3400,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 91a09e3d8890c..a314702b77924 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 87334d5bab497..247dd195ee34c 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9082,6 +9082,7 @@ public final class Settings { * @see#ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW * @hide */ + @TestApi public static final String ACCESSIBILITY_MAGNIFICATION_MODE = "accessibility_magnification_mode"; @@ -9089,12 +9090,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; /** @@ -9102,6 +9105,7 @@ public final class Settings { * region in a window. * @hide */ + @TestApi public static final int ACCESSIBILITY_MAGNIFICATION_MODE_ALL = 0x3; /** @@ -9113,6 +9117,7 @@ public final class Settings { * @see#ACCESSIBILITY_MAGNIFICATION_MODE_ALL * @hide */ + @TestApi public static final String ACCESSIBILITY_MAGNIFICATION_CAPABILITY = "accessibility_magnification_capability";