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

Commit d40f15a1 authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Android (Google) Code Review
Browse files

Merge "Remove @FlaggedApi from supplementalDescription" into main

parents 4fcb5ab5 91bfe75f

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