diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-06-02 10:52:59 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2015-06-02 16:56:41 -0700 |
| commit | 69c6adc96eecfde74ceb83cf9177428dc08b6067 (patch) | |
| tree | 1c9fb3e63573cf0133ad3680d3cc8a048b0874c0 /Android.mk | |
| parent | 133b107d28649ef5a984be0acc06f53e49853b22 (diff) | |
| download | frameworks_base-69c6adc96eecfde74ceb83cf9177428dc08b6067.zip frameworks_base-69c6adc96eecfde74ceb83cf9177428dc08b6067.tar.gz frameworks_base-69c6adc96eecfde74ceb83cf9177428dc08b6067.tar.bz2 | |
More API changes.
Start moving Assist* stuff to android.app.assist.
Clean up some more of the VoiceInteractionSession APIs.
Clearly document that finish() is not the same as hide(),
always call hide() instead, and fix the finish() path to
also always do a hide to make sure everything is cleaned
up correctly.
Change-Id: I962d4069fcb34fe89547a95d395ae1b9fa3b4148
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -555,8 +555,6 @@ aidl_files := \ frameworks/base/core/java/android/service/chooser/ChooserTarget.aidl \ frameworks/base/core/java/android/speech/tts/Voice.aidl \ frameworks/base/core/java/android/app/usage/UsageEvents.aidl \ - frameworks/base/core/java/android/app/AssistStructure.aidl \ - frameworks/base/core/java/android/app/AssistContent.aidl \ frameworks/base/core/java/android/app/Notification.aidl \ frameworks/base/core/java/android/app/NotificationManager.aidl \ frameworks/base/core/java/android/app/WallpaperInfo.aidl \ @@ -566,6 +564,8 @@ aidl_files := \ frameworks/base/core/java/android/app/AlarmManager.aidl \ frameworks/base/core/java/android/app/SearchableInfo.aidl \ frameworks/base/core/java/android/app/VoiceInteractor.aidl \ + frameworks/base/core/java/android/app/assist/AssistContent.aidl \ + frameworks/base/core/java/android/app/assist/AssistStructure.aidl \ frameworks/base/core/java/android/app/job/JobParameters.aidl \ frameworks/base/core/java/android/app/job/JobInfo.aidl \ frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \ |