summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-08-29 17:32:04 -0700
committerDianne Hackborn <hackbod@google.com>2014-09-02 10:29:28 -0700
commitd7c0395d26694c594c3e64b16ab647c971aeb422 (patch)
tree14e3e6765760116dc6e95607702e226ff99bd676 /core/java/android/provider
parent78358b17885cfb99f359f54c11565c0c3a998928 (diff)
downloadframeworks_base-d7c0395d26694c594c3e64b16ab647c971aeb422.zip
frameworks_base-d7c0395d26694c594c3e64b16ab647c971aeb422.tar.gz
frameworks_base-d7c0395d26694c594c3e64b16ab647c971aeb422.tar.bz2
Hide the interaction part of VoiceInteractionService.
Also the ability to start voice activities is turned off, though for testing purposes it can be turned back on with a system property. Change-Id: I867704d32c53beeb851ceea9b45c28bf5c01ef61
Diffstat (limited to 'core/java/android/provider')
-rw-r--r--core/java/android/provider/Settings.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index ae11f47..33e020b 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -18,6 +18,7 @@ package android.provider;
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
+import android.annotation.SystemApi;
import android.app.SearchManager;
import android.app.WallpaperManager;
import android.content.ComponentName;
@@ -131,6 +132,7 @@ public final class Settings {
"android.settings.AIRPLANE_MODE_SETTINGS";
/**
+ * @hide
* Activity Action: Modify Airplane mode settings using the users voice.
* <p>
* In some cases, a matching Activity may not exist, so ensure you safeguard against this.
@@ -152,6 +154,7 @@ public final class Settings {
* Output: Nothing.
*/
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ @SystemApi
public static final String ACTION_VOICE_CONTROL_AIRPLANE_MODE =
"android.settings.VOICE_CONTROL_AIRPLANE_MODE";
@@ -966,11 +969,13 @@ public final class Settings {
public static final String EXTRA_INPUT_METHOD_ID = "input_method_id";
/**
+ * @hide
* Activity Extra: Enable or disable Airplane Mode.
* <p>
* This can be passed as an extra field to the {@link #ACTION_VOICE_CONTROL_AIRPLANE_MODE}
* intent as a boolean.
*/
+ @SystemApi
public static final String EXTRA_AIRPLANE_MODE_ENABLED = "airplane_mode_enabled";
private static final String JID_RESOURCE_PREFIX = "android";