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

Commit 57e0ba6f authored by Sandeep Siddhartha's avatar Sandeep Siddhartha Committed by Android Git Automerger
Browse files

am e99f48c3: Merge "searchKeyphrase* should not be in the SDK" into lmp-dev 

* commit 'e99f48c340fc91ccfa4f9ca9fca27755694b88c8':
  searchKeyphrase* should not be in the SDK
parents 3e5576c5 9d9ef2e7

api/current.txt

+0 −4
Original line number Diff line number Diff line
@@ -1064,10 +1064,6 @@ package android { 
    field public static final int scrollingCache = 16843006; // 0x10100fe

    field public static final deprecated int searchButtonText = 16843269; // 0x1010205

    field public static final int searchIcon = 16843909; // 0x1010485

    field public static final int searchKeyphrase = 16843873; // 0x1010461

    field public static final int searchKeyphraseId = 16843872; // 0x1010460

    field public static final int searchKeyphraseRecognitionFlags = 16843948; // 0x10104ac

    field public static final int searchKeyphraseSupportedLocales = 16843874; // 0x1010462

    field public static final int searchMode = 16843221; // 0x10101d5

    field public static final int searchSettingsDescription = 16843402; // 0x101028a

    field public static final int searchSuggestAuthority = 16843222; // 0x10101d6

core/res/res/values/attrs.xml

+7 −5
Original line number Diff line number Diff line
@@ -6807,16 +6807,18 @@ 
    <!-- Use <code>voice-enrollment-application</code>

         as the root tag of the XML resource that escribes the supported keyphrases (hotwords)

         by the enrollment application.

         Described here are the attributes that can be included in that tag. -->

         Described here are the attributes that can be included in that tag.

         @hide

         @SystemApi -->

    <declare-styleable name="VoiceEnrollmentApplication">

        <!-- A globally unique ID for the keyphrase. -->

        <!-- A globally unique ID for the keyphrase. @hide @SystemApi -->

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

        <!-- The actual keyphrase/hint text, or empty if not keyphrase dependent. -->

        <!-- The actual keyphrase/hint text, or empty if not keyphrase dependent. @hide @SystemApi -->

        <attr name="searchKeyphrase" format="string" />

        <!-- A comma separated list of java locales that are supported for this keyphrase,

             or empty if not locale dependent. -->

             or empty if not locale dependent. @hide @SystemApi -->

        <attr name="searchKeyphraseSupportedLocales" format="string" />

        <!-- Flags for supported recognition modes. -->

        <!-- Flags for supported recognition modes. @hide @SystemApi -->

        <attr name="searchKeyphraseRecognitionFlags">

            <flag name="none" value="0" />

            <flag name="voiceTrigger" value="0x1" />