diff options
| author | Selim Cinek <cinek@google.com> | 2015-05-05 23:52:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-05 23:52:35 +0000 |
| commit | 6329bbceebc8c0d6de164cb693a828402542fd35 (patch) | |
| tree | 36671db8a9145fdf11f3d928622c26aa766581b4 /api | |
| parent | 9c7ce8b0fc8e429e2524b346174cb67b59c7e175 (diff) | |
| parent | e70d6535237d2e6f03adcd0bdc11e45ea714dc97 (diff) | |
| download | frameworks_base-6329bbceebc8c0d6de164cb693a828402542fd35.zip frameworks_base-6329bbceebc8c0d6de164cb693a828402542fd35.tar.gz frameworks_base-6329bbceebc8c0d6de164cb693a828402542fd35.tar.bz2 | |
Merge "The voice assist may now be launched above the lockscreen" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index ff66cf6..8716381 100644 --- a/api/current.txt +++ b/api/current.txt @@ -1190,6 +1190,7 @@ package android { field public static final int summaryOff = 16843248; // 0x10101f0 field public static final int summaryOn = 16843247; // 0x10101ef field public static final int supportsAssist = 16844012; // 0x10104ec + field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844022; // 0x10104f6 field public static final int supportsRtl = 16843695; // 0x10103af field public static final int supportsSwitchingToNextInputMethod = 16843755; // 0x10103eb field public static final int supportsUploading = 16843419; // 0x101029b @@ -29153,6 +29154,7 @@ package android.service.voice { method public final android.service.voice.AlwaysOnHotwordDetector createAlwaysOnHotwordDetector(java.lang.String, java.util.Locale, android.service.voice.AlwaysOnHotwordDetector.Callback); method public static boolean isActiveService(android.content.Context, android.content.ComponentName); method public android.os.IBinder onBind(android.content.Intent); + method public void onLaunchVoiceAssistFromKeyguard(); method public void onReady(); method public void onShutdown(); method public void showSession(android.os.Bundle, int); diff --git a/api/system-current.txt b/api/system-current.txt index ffcb86f..f11e113 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1266,6 +1266,7 @@ package android { field public static final int summaryOff = 16843248; // 0x10101f0 field public static final int summaryOn = 16843247; // 0x10101ef field public static final int supportsAssist = 16844012; // 0x10104ec + field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844022; // 0x10104f6 field public static final int supportsRtl = 16843695; // 0x10103af field public static final int supportsSwitchingToNextInputMethod = 16843755; // 0x10103eb field public static final int supportsUploading = 16843419; // 0x101029b @@ -31267,6 +31268,7 @@ package android.service.voice { method public final android.service.voice.AlwaysOnHotwordDetector createAlwaysOnHotwordDetector(java.lang.String, java.util.Locale, android.service.voice.AlwaysOnHotwordDetector.Callback); method public static boolean isActiveService(android.content.Context, android.content.ComponentName); method public android.os.IBinder onBind(android.content.Intent); + method public void onLaunchVoiceAssistFromKeyguard(); method public void onReady(); method public void onShutdown(); method public void showSession(android.os.Bundle, int); |