diff options
| author | Barnaby James <bjames@google.com> | 2015-07-06 17:08:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-06 17:08:15 +0000 |
| commit | c1e3ac321faea5717e1767bf2091334dde310eb7 (patch) | |
| tree | c960c8204a58db809f139c2961266911d3e454c2 /api | |
| parent | a72eac60c7a34089c8e288f03ce031172e3b36b4 (diff) | |
| parent | 371a2385b44f2c28506f4ed79737999b3f128007 (diff) | |
| download | frameworks_base-c1e3ac321faea5717e1767bf2091334dde310eb7.zip frameworks_base-c1e3ac321faea5717e1767bf2091334dde310eb7.tar.gz frameworks_base-c1e3ac321faea5717e1767bf2091334dde310eb7.tar.bz2 | |
Merge "Minor doc fixes for VoiceInteractor." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 5 | ||||
| -rw-r--r-- | api/system-current.txt | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt index 3304317..bb1070d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5430,7 +5430,6 @@ package android.app { public static class VoiceInteractor.AbortVoiceRequest extends android.app.VoiceInteractor.Request { ctor public VoiceInteractor.AbortVoiceRequest(android.app.VoiceInteractor.Prompt, android.os.Bundle); - ctor public deprecated VoiceInteractor.AbortVoiceRequest(java.lang.CharSequence, android.os.Bundle); method public void onAbortResult(android.os.Bundle); } @@ -5441,24 +5440,20 @@ package android.app { public static class VoiceInteractor.CompleteVoiceRequest extends android.app.VoiceInteractor.Request { ctor public VoiceInteractor.CompleteVoiceRequest(android.app.VoiceInteractor.Prompt, android.os.Bundle); - ctor public deprecated VoiceInteractor.CompleteVoiceRequest(java.lang.CharSequence, android.os.Bundle); method public void onCompleteResult(android.os.Bundle); } public static class VoiceInteractor.ConfirmationRequest extends android.app.VoiceInteractor.Request { ctor public VoiceInteractor.ConfirmationRequest(android.app.VoiceInteractor.Prompt, android.os.Bundle); - ctor public deprecated VoiceInteractor.ConfirmationRequest(java.lang.CharSequence, android.os.Bundle); method public void onConfirmationResult(boolean, android.os.Bundle); } public static class VoiceInteractor.PickOptionRequest extends android.app.VoiceInteractor.Request { ctor public VoiceInteractor.PickOptionRequest(android.app.VoiceInteractor.Prompt, android.app.VoiceInteractor.PickOptionRequest.Option[], android.os.Bundle); - ctor public deprecated VoiceInteractor.PickOptionRequest(java.lang.CharSequence, android.app.VoiceInteractor.PickOptionRequest.Option[], android.os.Bundle); method public void onPickOptionResult(boolean, android.app.VoiceInteractor.PickOptionRequest.Option[], android.os.Bundle); } public static final class VoiceInteractor.PickOptionRequest.Option implements android.os.Parcelable { - ctor public VoiceInteractor.PickOptionRequest.Option(java.lang.CharSequence); ctor public VoiceInteractor.PickOptionRequest.Option(java.lang.CharSequence, int); method public android.app.VoiceInteractor.PickOptionRequest.Option addSynonym(java.lang.CharSequence); method public int countSynonyms(); diff --git a/api/system-current.txt b/api/system-current.txt index f7955dd..5861560 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5546,7 +5546,6 @@ package android.app { public static class VoiceInteractor.AbortVoiceRequest extends android.app.VoiceInteractor.Request { ctor public VoiceInteractor.AbortVoiceRequest(android.app.VoiceInteractor.Prompt, android.os.Bundle); - ctor public deprecated VoiceInteractor.AbortVoiceRequest(java.lang.CharSequence, android.os.Bundle); method public void onAbortResult(android.os.Bundle); } @@ -5557,24 +5556,20 @@ package android.app { public static class VoiceInteractor.CompleteVoiceRequest extends android.app.VoiceInteractor.Request { ctor public VoiceInteractor.CompleteVoiceRequest(android.app.VoiceInteractor.Prompt, android.os.Bundle); - ctor public deprecated VoiceInteractor.CompleteVoiceRequest(java.lang.CharSequence, android.os.Bundle); method public void onCompleteResult(android.os.Bundle); } public static class VoiceInteractor.ConfirmationRequest extends android.app.VoiceInteractor.Request { ctor public VoiceInteractor.ConfirmationRequest(android.app.VoiceInteractor.Prompt, android.os.Bundle); - ctor public deprecated VoiceInteractor.ConfirmationRequest(java.lang.CharSequence, android.os.Bundle); method public void onConfirmationResult(boolean, android.os.Bundle); } public static class VoiceInteractor.PickOptionRequest extends android.app.VoiceInteractor.Request { ctor public VoiceInteractor.PickOptionRequest(android.app.VoiceInteractor.Prompt, android.app.VoiceInteractor.PickOptionRequest.Option[], android.os.Bundle); - ctor public deprecated VoiceInteractor.PickOptionRequest(java.lang.CharSequence, android.app.VoiceInteractor.PickOptionRequest.Option[], android.os.Bundle); method public void onPickOptionResult(boolean, android.app.VoiceInteractor.PickOptionRequest.Option[], android.os.Bundle); } public static final class VoiceInteractor.PickOptionRequest.Option implements android.os.Parcelable { - ctor public VoiceInteractor.PickOptionRequest.Option(java.lang.CharSequence); ctor public VoiceInteractor.PickOptionRequest.Option(java.lang.CharSequence, int); method public android.app.VoiceInteractor.PickOptionRequest.Option addSynonym(java.lang.CharSequence); method public int countSynonyms(); |