diff options
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 20 |
2 files changed, 10 insertions, 14 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 3e781670c784..a5f3bf68fa75 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -188,10 +188,6 @@ package android { field public static final int isVrOnly = 16844152; // 0x1010578 field public static final int requiredSystemPropertyName = 16844133; // 0x1010565 field public static final int requiredSystemPropertyValue = 16844134; // 0x1010566 - field public static final int searchKeyphrase = 16843871; // 0x101045f - field public static final int searchKeyphraseId = 16843870; // 0x101045e - field public static final int searchKeyphraseRecognitionFlags = 16843942; // 0x10104a6 - field public static final int searchKeyphraseSupportedLocales = 16843872; // 0x1010460 } public static final class R.raw { diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 64febf1f7ee4..41f74917840f 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -7748,21 +7748,21 @@ <attr name="settingsActivity" /> </declare-styleable> - <!-- @SystemApi Use <code>trust-agent</code> as the root tag of the XML resource that + <!-- Use <code>trust-agent</code> as the root tag of the XML resource that describes an {@link android.service.trust.TrustAgentService}, which is referenced from its {@link android.service.trust.TrustAgentService#TRUST_AGENT_META_DATA} meta-data entry. Described here are the attributes that can be included in that tag. @hide --> <declare-styleable name="TrustAgent"> - <!-- @SystemApi Component name of an activity that allows the user to modify + <!-- Component name of an activity that allows the user to modify the settings for this trust agent. @hide --> <attr name="settingsActivity" /> - <!-- @SystemApi Title for a preference that allows that user to launch the + <!-- Title for a preference that allows that user to launch the activity to modify trust agent settings. @hide --> <attr name="title" /> - <!-- @SystemApi Summary for the same preference as the title. @hide --> + <!-- Summary for the same preference as the title. @hide --> <attr name="summary" /> - <!-- @SystemApi Whether trust agent can unlock a user profile @hide --> + <!-- Whether trust agent can unlock a user profile @hide --> <attr name="unlockProfile" format="boolean"/> </declare-styleable> @@ -7972,16 +7972,16 @@ by the enrollment application. 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. @hide @SystemApi --> + <!-- A globally unique ID for the keyphrase. @hide --> <attr name="searchKeyphraseId" format="integer" /> - <!-- The actual keyphrase/hint text, or empty if not keyphrase dependent. @hide @SystemApi --> + <!-- The actual keyphrase/hint text, or empty if not keyphrase dependent. @hide --> <attr name="searchKeyphrase" format="string" /> <!-- A comma separated list of BCP-47 language tag for locales that are supported - for this keyphrase, or empty if not locale dependent. @hide @SystemApi --> + for this keyphrase, or empty if not locale dependent. @hide --> <attr name="searchKeyphraseSupportedLocales" format="string" /> - <!-- Flags for supported recognition modes. @hide @SystemApi --> + <!-- Flags for supported recognition modes. @hide --> <attr name="searchKeyphraseRecognitionFlags"> <flag name="none" value="0" /> <flag name="voiceTrigger" value="0x1" /> |