diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-05-30 23:54:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-30 23:54:11 +0000 |
| commit | 725010a83f1798e5ba6edb93ca2656a96c29fcae (patch) | |
| tree | 4f8f9b48833b68f374f0e0e8d9e6bfe7bfc53b37 /api | |
| parent | b8a0feed0406e91eaa6f5bee223bc9316171c2b6 (diff) | |
| parent | a2c076d54048258cf88ab14551ce5fdf5a09c6e8 (diff) | |
| download | frameworks_base-725010a83f1798e5ba6edb93ca2656a96c29fcae.zip frameworks_base-725010a83f1798e5ba6edb93ca2656a96c29fcae.tar.gz frameworks_base-725010a83f1798e5ba6edb93ca2656a96c29fcae.tar.bz2 | |
Merge "Clean up voice API." into lmp-preview-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 265c682..235dca8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5029,6 +5029,11 @@ package android.app { method public boolean[] supportsCommands(java.lang.String[]); } + public static class VoiceInteractor.AbortVoiceRequest extends android.app.VoiceInteractor.Request { + ctor public VoiceInteractor.AbortVoiceRequest(java.lang.CharSequence, android.os.Bundle); + method public void onAbortResult(android.os.Bundle); + } + public static class VoiceInteractor.CommandRequest extends android.app.VoiceInteractor.Request { ctor public VoiceInteractor.CommandRequest(java.lang.String, android.os.Bundle); method public void onCommandResult(android.os.Bundle); @@ -26195,16 +26200,17 @@ package android.service.voice { method public android.view.LayoutInflater getLayoutInflater(); method public android.app.Dialog getWindow(); method public void hideWindow(); + method public void onAbortVoice(android.service.voice.VoiceInteractionSession.Caller, android.service.voice.VoiceInteractionSession.Request, java.lang.CharSequence, android.os.Bundle); method public void onBackPressed(); method public abstract void onCancel(android.service.voice.VoiceInteractionSession.Request); method public void onCloseSystemDialogs(); method public abstract void onCommand(android.service.voice.VoiceInteractionSession.Caller, android.service.voice.VoiceInteractionSession.Request, java.lang.String, android.os.Bundle); method public void onComputeInsets(android.service.voice.VoiceInteractionSession.Insets); - method public abstract void onConfirm(android.service.voice.VoiceInteractionSession.Caller, android.service.voice.VoiceInteractionSession.Request, java.lang.String, android.os.Bundle); + method public abstract void onConfirm(android.service.voice.VoiceInteractionSession.Caller, android.service.voice.VoiceInteractionSession.Request, java.lang.CharSequence, android.os.Bundle); method public void onCreate(android.os.Bundle); method public android.view.View onCreateContentView(); method public void onDestroy(); - method public abstract boolean[] onGetSupportedCommands(android.service.voice.VoiceInteractionSession.Caller, java.lang.String[]); + method public boolean[] onGetSupportedCommands(android.service.voice.VoiceInteractionSession.Caller, java.lang.String[]); method public boolean onKeyDown(int, android.view.KeyEvent); method public boolean onKeyLongPress(int, android.view.KeyEvent); method public boolean onKeyMultiple(int, int, android.view.KeyEvent); @@ -26231,6 +26237,7 @@ package android.service.voice { } public static class VoiceInteractionSession.Request { + method public void sendAbortVoiceResult(android.os.Bundle); method public void sendCancelResult(); method public void sendCommandResult(boolean, android.os.Bundle); method public void sendConfirmResult(boolean, android.os.Bundle); |