diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-08-12 15:06:50 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2014-08-12 15:38:19 -0700 |
| commit | a3fb40d5f492825bb86769f541620baca5616e05 (patch) | |
| tree | b0ee1bfed076637ffd16ef5b3087c961ba0fb3a2 /core/java/android/provider | |
| parent | e25547b335bf44568cf8eed2294f43d7853049d2 (diff) | |
| download | frameworks_base-a3fb40d5f492825bb86769f541620baca5616e05.zip frameworks_base-a3fb40d5f492825bb86769f541620baca5616e05.tar.gz frameworks_base-a3fb40d5f492825bb86769f541620baca5616e05.tar.bz2 | |
Add 560dpi, and some other stuff.
Like new settings actions for some of the new settings panels.
And fix voice interaction services so they require a recognizer.
And tweak array map doc to be correct.
Blah blah blah.
Change-Id: Ib5e66b574b10e7b3fa39723b21046a74e6ead204
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 55ba9e9..9a41e20 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -170,6 +170,20 @@ public final class Settings { "android.settings.ACCESSIBILITY_SETTINGS"; /** + * Activity Action: Show settings to control access to usage information. + * <p> + * In some cases, a matching Activity may not exist, so ensure you + * safeguard against this. + * <p> + * Input: Nothing. + * <p> + * Output: Nothing. + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_USAGE_ACCESS_SETTINGS = + "android.settings.USAGE_ACCESS_SETTINGS"; + + /** * Activity Action: Show settings to allow configuration of security and * location privacy. * <p> @@ -372,6 +386,21 @@ public final class Settings { * Output: Nothing. */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_VOICE_INPUT_SETTINGS = + "android.settings.VOICE_INPUT_SETTINGS"; + + /** + * Activity Action: Show settings to configure input methods, in particular + * allowing the user to enable input methods. + * <p> + * In some cases, a matching Activity may not exist, so ensure you + * safeguard against this. + * <p> + * Input: Nothing. + * <p> + * Output: Nothing. + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS"; @@ -6343,7 +6372,7 @@ public final class Settings { /** * Milliseconds to wait before bouncing Wi-Fi after settings is restored. Note that after - * the caller is done with this, they should call {@link ContentResolver#delete(Uri)} to + * the caller is done with this, they should call {@link ContentResolver#delete} to * clean up any value that they may have written. * * @hide |