diff options
| author | Cedric Ho <cedricho@google.com> | 2015-04-29 17:59:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-29 17:59:37 +0000 |
| commit | a02ac06b906480105069efb3463d6067d864ad8f (patch) | |
| tree | 79e5e6432c908c874e2931eca305b7dc2e7ebb07 /api | |
| parent | 31229a39ce167bfd2ad0c41a9cc4b043dbccd241 (diff) | |
| parent | 94ae5f3c089e9bdd39011dacc09411058ddc4a6e (diff) | |
| download | frameworks_base-a02ac06b906480105069efb3463d6067d864ad8f.zip frameworks_base-a02ac06b906480105069efb3463d6067d864ad8f.tar.gz frameworks_base-a02ac06b906480105069efb3463d6067d864ad8f.tar.bz2 | |
am 94ae5f3c: am fbad902a: am 80fa2cc8: Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev
* commit '94ae5f3c089e9bdd39011dacc09411058ddc4a6e':
Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 7bcf3c7..7c34c93 100644 --- a/api/current.txt +++ b/api/current.txt @@ -29202,6 +29202,7 @@ package android.speech { field public static final java.lang.String EXTRA_ONLY_RETURN_LANGUAGE_PREFERENCE = "android.speech.extra.ONLY_RETURN_LANGUAGE_PREFERENCE"; field public static final java.lang.String EXTRA_ORIGIN = "android.speech.extra.ORIGIN"; field public static final java.lang.String EXTRA_PARTIAL_RESULTS = "android.speech.extra.PARTIAL_RESULTS"; + field public static final java.lang.String EXTRA_PREFER_OFFLINE = "android.speech.extra.PREFER_OFFLINE"; field public static final java.lang.String EXTRA_PROMPT = "android.speech.extra.PROMPT"; field public static final java.lang.String EXTRA_RESULTS = "android.speech.extra.RESULTS"; field public static final java.lang.String EXTRA_RESULTS_PENDINGINTENT = "android.speech.extra.RESULTS_PENDINGINTENT"; diff --git a/api/system-current.txt b/api/system-current.txt index 7fec76c..88772cc 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -31307,6 +31307,7 @@ package android.speech { field public static final java.lang.String EXTRA_ONLY_RETURN_LANGUAGE_PREFERENCE = "android.speech.extra.ONLY_RETURN_LANGUAGE_PREFERENCE"; field public static final java.lang.String EXTRA_ORIGIN = "android.speech.extra.ORIGIN"; field public static final java.lang.String EXTRA_PARTIAL_RESULTS = "android.speech.extra.PARTIAL_RESULTS"; + field public static final java.lang.String EXTRA_PREFER_OFFLINE = "android.speech.extra.PREFER_OFFLINE"; field public static final java.lang.String EXTRA_PROMPT = "android.speech.extra.PROMPT"; field public static final java.lang.String EXTRA_RESULTS = "android.speech.extra.RESULTS"; field public static final java.lang.String EXTRA_RESULTS_PENDINGINTENT = "android.speech.extra.RESULTS_PENDINGINTENT"; |