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

Commit feecac19 authored by Daniel Akinola's avatar Daniel Akinola Committed by Android (Google) Code Review
Browse files

Merge "Update ADD_TYPE_WINDOW_CONTROL to ENABLE_TYPE_WINDOW_CONTROL" into main

parents d4ce46b1 3037021e

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -55309,7 +55309,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

    field @FlaggedApi("android.view.accessibility.enable_type_window_control") public static final int TYPE_WINDOW_CONTROL = 7; // 0x7

  }















  public class CaptioningManager {

























core/java/android/view/accessibility/AccessibilityWindowInfo.java



+2
−2






























Original line number
Diff line number
Diff line








@@ -97,7 +97,7 @@ public final class AccessibilityWindowInfo implements Parcelable {













    /**















     * Window type: A system window that has the function to control an associated window.















     */













    @FlaggedApi(Flags.FLAG_ADD_TYPE_WINDOW_CONTROL)













    @FlaggedApi(Flags.FLAG_ENABLE_TYPE_WINDOW_CONTROL)















    public static final int TYPE_WINDOW_CONTROL = 7;































    /* Special values for window IDs */










@@ -880,7 +880,7 @@ public final class AccessibilityWindowInfo implements Parcelable {













     * @hide















     */















    public static String typeToString(int type) {













        if (Flags.addTypeWindowControl() && type == TYPE_WINDOW_CONTROL) {













        if (Flags.enableTypeWindowControl() && type == TYPE_WINDOW_CONTROL) {















            return "TYPE_WINDOW_CONTROL";















        }

















































core/java/android/view/accessibility/flags/accessibility_flags.aconfig



+1
−2






























Original line number
Diff line number
Diff line








@@ -122,9 +122,8 @@ flag {





























flag {















    namespace: "accessibility"













    name: "add_type_window_control"













    name: "enable_type_window_control"















    is_exported: true













    is_fixed_read_only: true















    description: "adds new TYPE_WINDOW_CONTROL to AccessibilityWindowInfo for detecting Window Decorations"















    bug: "320445550"















}