From 69c6adc96eecfde74ceb83cf9177428dc08b6067 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Tue, 2 Jun 2015 10:52:59 -0700 Subject: 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 --- Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index d6dac53..4d8a37c 100644 --- a/Android.mk +++ b/Android.mk @@ -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 \ -- cgit v1.1