summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/assist
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-07-17 18:04:14 -0700
committerDianne Hackborn <hackbod@google.com>2015-07-20 12:49:10 -0700
commit17f693520da8977c4a60f5b4be3be035cba7146c (patch)
tree6e3fcf5d6adb3d72ab5b7c2300f3bb8ebe8bc550 /packages/SystemUI/src/com/android/systemui/assist
parent5aff3b5489262ccff4b6f9e18e0d990ebfe4d7bc (diff)
downloadframeworks_base-17f693520da8977c4a60f5b4be3be035cba7146c.zip
frameworks_base-17f693520da8977c4a60f5b4be3be035cba7146c.tar.gz
frameworks_base-17f693520da8977c4a60f5b4be3be035cba7146c.tar.bz2
Fix issue #22531747: Assist info should declare if user has disabled...
...context and/or screenshot Added new API to find out what contextual data has been globally disabled. Also updated various documentation to make it clear what kind of contextual data you will get (and when it will be null). Also added a new Activity.showAssist() API because... well, I was already in there, it was easy to do, it is safe, and maybe people will build cool things with it. Change-Id: Ia553d6bcdd098dc0fce4b9237fbfaca9652fc74b
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/assist')
-rw-r--r--packages/SystemUI/src/com/android/systemui/assist/AssistManager.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
index 0daa5c9..f66a7dd 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
@@ -18,6 +18,7 @@ import android.os.Handler;
import android.os.RemoteException;
import android.os.UserHandle;
import android.provider.Settings;
+import android.service.voice.VoiceInteractionSession;
import android.util.Log;
import android.view.Gravity;
import android.view.HapticFeedbackConstants;
@@ -218,7 +219,8 @@ public class AssistManager {
}
private void startVoiceInteractor(Bundle args) {
- mAssistUtils.showSessionForActiveService(args, mShowCallback);
+ mAssistUtils.showSessionForActiveService(args,
+ VoiceInteractionSession.SHOW_SOURCE_ASSIST_GESTURE, mShowCallback, null);
}
public void launchVoiceAssistFromKeyguard() {