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

Commit 3a7b5ffa authored by Victoria Lestari's avatar Victoria Lestari Committed by Android (Google) Code Review
Browse files

Merge "Update attrs.xml and public.xml to allow a recognition service to be... 

Merge "Update attrs.xml and public.xml to allow a recognition service to be selected as default" into sc-dev
parents f70bb15f 6d9979b6

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1259,6 +1259,7 @@ package android { 
    field public static final int segmentedButtonStyle = 16843568; // 0x1010330

    field public static final int selectAllOnFocus = 16843102; // 0x101015e

    field public static final int selectable = 16843238; // 0x10101e6

    field public static final int selectableAsDefault = 16844352; // 0x1010640

    field public static final int selectableItemBackground = 16843534; // 0x101030e

    field public static final int selectableItemBackgroundBorderless = 16843868; // 0x101045c

    field @Deprecated public static final int selectedDateVerticalBar = 16843591; // 0x1010347

core/res/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -8633,6 +8633,9 @@ 
         Described here are the attributes that can be included in that tag. -->

    <declare-styleable name="RecognitionService">

        <attr name="settingsActivity" />

        <!-- Flag indicating whether a recognition service can be selected as default. The default

             value of this flag is true. -->

        <attr name="selectableAsDefault" format="boolean" />

    </declare-styleable>















    <!-- Use <code>voice-interaction-service</code> as the root tag of the XML resource that

































core/res/res/values/public.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -3086,6 +3086,7 @@













    <public name="hand_secondTintMode"/>















    <public name="dataExtractionRules"/>















    <public name="passwordsActivity"/>













    <public name="selectableAsDefault"/>















  </public-group>































  <public-group type="drawable" first-id="0x010800b5">