diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-02-26 18:59:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-26 18:59:57 +0000 |
| commit | 93ec05ca470453cc0505d2e387a7f4e3a2fe07d8 (patch) | |
| tree | 9f1d0b458bc95900f7216a2e0fd53c817ae78eee /api | |
| parent | d849518369846cffdf75679fe70712fe89a573ad (diff) | |
| parent | ffeecb1bfb9b71f4b62c9ef1fbf7b58a7a63f655 (diff) | |
| download | frameworks_base-93ec05ca470453cc0505d2e387a7f4e3a2fe07d8.zip frameworks_base-93ec05ca470453cc0505d2e387a7f4e3a2fe07d8.tar.gz frameworks_base-93ec05ca470453cc0505d2e387a7f4e3a2fe07d8.tar.bz2 | |
Merge "Rework voice interaction session lifecycle."
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 6 | ||||
| -rw-r--r-- | api/system-current.txt | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index a356307..676a1cd 100644 --- a/api/current.txt +++ b/api/current.txt @@ -27657,7 +27657,7 @@ package android.service.voice { method public android.os.IBinder onBind(android.content.Intent); method public void onReady(); method public void onShutdown(); - method public void startSession(android.os.Bundle, int); + method public void showSession(android.os.Bundle, int); field public static final java.lang.String SERVICE_INTERFACE = "android.service.voice.VoiceInteractionService"; field public static final java.lang.String SERVICE_META_DATA = "android.voice_interaction"; field public static final int START_WITH_ASSIST = 1; // 0x1 @@ -27669,6 +27669,7 @@ package android.service.voice { method public void finish(); method public android.view.LayoutInflater getLayoutInflater(); method public android.app.Dialog getWindow(); + method public void hide(); 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(); @@ -27683,14 +27684,17 @@ package android.service.voice { method public void onDestroy(); method public boolean[] onGetSupportedCommands(android.service.voice.VoiceInteractionSession.Caller, java.lang.String[]); method public void onHandleAssist(android.os.Bundle); + method public void onHide(); 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); method public boolean onKeyUp(int, android.view.KeyEvent); + method public void onShow(android.os.Bundle, int); method public void onTaskFinished(android.content.Intent, int); method public void onTaskStarted(android.content.Intent, int); method public void setContentView(android.view.View); method public void setTheme(int); + method public void show(); method public void showWindow(); method public void startVoiceActivity(android.content.Intent); } diff --git a/api/system-current.txt b/api/system-current.txt index 7db9c54..95e57c4 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -29346,7 +29346,7 @@ package android.service.voice { method public android.os.IBinder onBind(android.content.Intent); method public void onReady(); method public void onShutdown(); - method public void startSession(android.os.Bundle, int); + method public void showSession(android.os.Bundle, int); field public static final java.lang.String SERVICE_INTERFACE = "android.service.voice.VoiceInteractionService"; field public static final java.lang.String SERVICE_META_DATA = "android.voice_interaction"; field public static final int START_WITH_ASSIST = 1; // 0x1 @@ -29358,6 +29358,7 @@ package android.service.voice { method public void finish(); method public android.view.LayoutInflater getLayoutInflater(); method public android.app.Dialog getWindow(); + method public void hide(); 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(); @@ -29372,14 +29373,17 @@ package android.service.voice { method public void onDestroy(); method public boolean[] onGetSupportedCommands(android.service.voice.VoiceInteractionSession.Caller, java.lang.String[]); method public void onHandleAssist(android.os.Bundle); + method public void onHide(); 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); method public boolean onKeyUp(int, android.view.KeyEvent); + method public void onShow(android.os.Bundle, int); method public void onTaskFinished(android.content.Intent, int); method public void onTaskStarted(android.content.Intent, int); method public void setContentView(android.view.View); method public void setTheme(int); + method public void show(); method public void showWindow(); method public void startVoiceActivity(android.content.Intent); } |