diff options
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 19 |
2 files changed, 15 insertions, 6 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 6258b33fa626..4a9491876689 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -6210,7 +6210,7 @@ package android.provider { public static final class Settings.Secure extends android.provider.Settings.NameValueTable { method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static boolean putString(@NonNull android.content.ContentResolver, @NonNull String, @Nullable String, @Nullable String, boolean); 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_NAVBAR_ENABLED = "accessibility_display_magnification_navbar_enabled"; + field @Deprecated public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED = "accessibility_display_magnification_navbar_enabled"; field public static final String ASSIST_GESTURE_SETUP_COMPLETE = "assist_gesture_setup_complete"; field public static final String AUTOFILL_FEATURE_FIELD_CLASSIFICATION = "autofill_field_classification"; field public static final String AUTOFILL_USER_DATA_MAX_CATEGORY_COUNT = "autofill_user_data_max_category_count"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 381d4921932f..9e083393241d 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6133,8 +6133,12 @@ public final class Settings { "accessibility_shortcut_dialog_shown"; /** - * Setting specifying the accessibility service to be toggled via the accessibility - * shortcut. Must be its flattened {@link ComponentName}. + * Setting specifying the accessibility services, accessibility shortcut targets, + * or features to be toggled via the accessibility shortcut. + * + * <p> This is a colon-separated string list which contains the flattened + * {@link ComponentName} and the class name of a system class implementing a supported + * accessibility feature. * @hide */ @TestApi @@ -6142,9 +6146,11 @@ public final class Settings { "accessibility_shortcut_target_service"; /** - * Setting specifying the accessibility service or feature to be toggled via the - * accessibility button in the navigation bar. This is either a flattened - * {@link ComponentName} or the class name of a system class implementing a supported + * Setting specifying the accessibility services, accessibility shortcut targets, + * or features to be toggled via the accessibility button in the navigation bar. + * + * <p> This is a colon-separated string list which contains the flattened + * {@link ComponentName} and the class name of a system class implementing a supported * accessibility feature. * @hide */ @@ -6304,6 +6310,9 @@ public final class Settings { * zoom in the display content and is targeted to low vision users. The current * magnification scale is controlled by {@link #ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE}. * + * @deprecated Use {@link #ACCESSIBILITY_BUTTON_TARGET_COMPONENT} instead. + * {@link #ACCESSIBILITY_BUTTON_TARGET_COMPONENT} holds the magnification system class name + * when navigation bar magnification is enabled. * @hide */ @SystemApi |