diff options
| author | 2025-02-12 09:57:00 -0800 | |
|---|---|---|
| committer | 2025-02-12 09:57:00 -0800 | |
| commit | d40f15a116d2e3691d58cfef0264f5afff6ba6c6 (patch) | |
| tree | 5cf31e6e8f43efc00beebf4d039835de36b6089e | |
| parent | 4fcb5ab58af7bc5dd919de540da08738491bc024 (diff) | |
| parent | 91bfe75fb7be292bd558dbb0f1c99004efbf90fe (diff) | |
Merge "Remove @FlaggedApi from supplementalDescription" into main
| -rw-r--r-- | core/res/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/public-final.xml | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index a1f85c380a95..66111785af4f 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -3313,7 +3313,6 @@ <!-- Provides brief supplemental information for the view, such as the purpose of the view when that purpose is not conveyed within its textual representation. This property is used primarily for accessibility. --> - <!-- @FlaggedApi("android.view.accessibility.supplemental_description") --> <attr name="supplementalDescription" format="string" localization="suggested" /> <!-- Sets the id of a view that screen readers are requested to visit after this view. diff --git a/core/res/res/values/public-final.xml b/core/res/res/values/public-final.xml index af1e5123096d..61e2a28562d2 100644 --- a/core/res/res/values/public-final.xml +++ b/core/res/res/values/public-final.xml @@ -3941,7 +3941,7 @@ <!-- @FlaggedApi("android.permission.flags.replace_body_sensor_permission_enabled") @hide @SystemApi --> <public name="backgroundPermission"/> - <!-- @FlaggedApi(android.view.accessibility.supplemental_description) --> + <!-- @FlaggedApi("android.view.accessibility.supplemental_description") --> <public name="supplementalDescription"/> <!-- @FlaggedApi("android.security.enable_intent_matching_flags") --> <public name="intentMatchingFlags"/> @@ -3969,7 +3969,7 @@ <!-- @FlaggedApi("android.permission.flags.replace_body_sensor_permission_enabled") @hide @SystemApi --> <public type="attr" name="backgroundPermission" id="0x010106a7" /> - <!-- @FlaggedApi(android.view.accessibility.supplemental_description) --> + <!-- @FlaggedApi("android.view.accessibility.supplemental_description") --> <public type="attr" name="supplementalDescription" id="0x010106a8" /> <!-- @FlaggedApi("android.security.enable_intent_matching_flags") --> <public type="attr" name="intentMatchingFlags" id="0x010106a9" /> |