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

Commit c2427dd6 authored by Aleksandar Kiridžić's avatar Aleksandar Kiridžić Committed by Android (Google) Code Review
Browse files

Merge "Revert "speech: Update recognition-service resource""

parents f5959281 c074f7ab

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -1042,7 +1042,6 @@ package android { 
    field public static final int max = 16843062; // 0x1010136

    field public static final int maxAspectRatio = 16844128; // 0x1010560

    field public static final int maxButtonHeight = 16844029; // 0x10104fd

    field public static final int maxConcurrentSessionsCount;

    field public static final int maxDate = 16843584; // 0x1010340

    field public static final int maxEms = 16843095; // 0x1010157

    field public static final int maxHeight = 16843040; // 0x1010120

core/res/res/values/attrs.xml

+0 −3
Original line number Diff line number Diff line
@@ -8955,9 +8955,6 @@ 
        <!-- Flag indicating whether a recognition service can be selected as default. The default

             value of this flag is true. -->

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

        <!-- The maximal number of recognition sessions ongoing at the same time.

             The default value is 1, meaning no concurrency. -->

        <attr name="maxConcurrentSessionsCount" format="integer" />

    </declare-styleable>















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

































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



+1
−1




























Original line number
Diff line number
Diff line








@@ -117,7 +117,7 @@













    <public name="accessibilityDataPrivate" />















    <public name="enableTextStylingShortcuts" />















    <public name="requiredDisplayCategory"/>













    <public name="maxConcurrentSessionsCount" />













    <public name="removed_maxConcurrentSessionsCount" />















  </staging-public-group>































  <staging-public-group type="id" first-id="0x01cd0000">