diff options
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/view/accessibility/AccessibilityWindowInfo.java | 11 | ||||
| -rw-r--r-- | core/java/android/view/accessibility/flags/accessibility_flags.aconfig | 7 |
3 files changed, 19 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index ec8bc96ef100..4cead9e05b78 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -55088,6 +55088,7 @@ package android.view.accessibility { field public static final int TYPE_MAGNIFICATION_OVERLAY = 6; // 0x6 field public static final int TYPE_SPLIT_SCREEN_DIVIDER = 5; // 0x5 field public static final int TYPE_SYSTEM = 3; // 0x3 + field @FlaggedApi("android.view.accessibility.add_type_window_control") public static final int TYPE_WINDOW_CONTROL = 7; // 0x7 } public class CaptioningManager { diff --git a/core/java/android/view/accessibility/AccessibilityWindowInfo.java b/core/java/android/view/accessibility/AccessibilityWindowInfo.java index fa0052cf664a..749f977f5e50 100644 --- a/core/java/android/view/accessibility/AccessibilityWindowInfo.java +++ b/core/java/android/view/accessibility/AccessibilityWindowInfo.java @@ -16,6 +16,7 @@ package android.view.accessibility; +import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.TestApi; @@ -93,6 +94,12 @@ public final class AccessibilityWindowInfo implements Parcelable { */ public static final int TYPE_MAGNIFICATION_OVERLAY = 6; + /** + * Window type: A system window that has the function to control an associated window. + */ + @FlaggedApi(Flags.FLAG_ADD_TYPE_WINDOW_CONTROL) + public static final int TYPE_WINDOW_CONTROL = 7; + /* Special values for window IDs */ /** @hide */ public static final int ACTIVE_WINDOW_ID = Integer.MAX_VALUE; @@ -873,6 +880,10 @@ public final class AccessibilityWindowInfo implements Parcelable { * @hide */ public static String typeToString(int type) { + if (Flags.addTypeWindowControl() && type == TYPE_WINDOW_CONTROL) { + return "TYPE_WINDOW_CONTROL"; + } + switch (type) { case TYPE_APPLICATION: { return "TYPE_APPLICATION"; diff --git a/core/java/android/view/accessibility/flags/accessibility_flags.aconfig b/core/java/android/view/accessibility/flags/accessibility_flags.aconfig index a11ac7cb48ad..5b99c71f3a8b 100644 --- a/core/java/android/view/accessibility/flags/accessibility_flags.aconfig +++ b/core/java/android/view/accessibility/flags/accessibility_flags.aconfig @@ -102,6 +102,13 @@ flag { flag { namespace: "accessibility" + name: "add_type_window_control" + description: "adds new TYPE_WINDOW_CONTROL to AccessibilityWindowInfo for detecting Window Decorations" + bug: "320445550" +} + +flag { + namespace: "accessibility" name: "update_always_on_a11y_service" description: "Updates the Always-On A11yService state when the user changes the enablement of the shortcut." bug: "298869916" |