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

Commit 91bfe75f authored by Linus Tufvesson's avatar Linus Tufvesson
Browse files

Remove @FlaggedApi from supplementalDescription 

and fix @FlaggedApi in public-final.xml (it was missing qoutes for the
supplemental_description flag)

This was confusing aapt2 when creating android.R.styleable, it was
rejecting this resoucre if the flag was READ_WRITE, which it always is
for trunk_staging

RESOURCES_FINALIZATION

Flag: EXEMPT Baklava Finalization
Bug: 393356045
Bug: 396046850
Bug: 396104948
Test: m out/soong/.intermediates/frameworks/base/api/ds-static-docs/android_common/ds-static-docs-docs.zip
Change-Id: I4bf244f5a2eb17a6cad06386e845efdd19028d49
parent 658b0cad

core/res/res/values/attrs.xml

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

































core/res/res/values/public-final.xml



+2
−2




























Original line number
Diff line number
Diff line








@@ -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" />