diff options
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 31 | ||||
| -rw-r--r-- | core/java/android/service/voice/VoiceInteractionServiceInfo.java | 4 | ||||
| -rw-r--r-- | core/java/android/util/ArrayMap.java | 2 | ||||
| -rw-r--r-- | core/java/android/util/DisplayMetrics.java | 10 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 6 |
6 files changed, 51 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index e8d1369..af2432c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25886,8 +25886,10 @@ package android.provider { field public static final java.lang.String ACTION_SHOW_REGULATORY_INFO = "android.settings.SHOW_REGULATORY_INFO"; field public static final java.lang.String ACTION_SOUND_SETTINGS = "android.settings.SOUND_SETTINGS"; field public static final java.lang.String ACTION_SYNC_SETTINGS = "android.settings.SYNC_SETTINGS"; + field public static final java.lang.String ACTION_USAGE_ACCESS_SETTINGS = "android.settings.USAGE_ACCESS_SETTINGS"; field public static final java.lang.String ACTION_USER_DICTIONARY_SETTINGS = "android.settings.USER_DICTIONARY_SETTINGS"; field public static final java.lang.String ACTION_VOICE_CONTROL_AIRPLANE_MODE = "android.settings.VOICE_CONTROL_AIRPLANE_MODE"; + field public static final java.lang.String ACTION_VOICE_INPUT_SETTINGS = "android.settings.VOICE_INPUT_SETTINGS"; field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS"; field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS"; field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS"; @@ -32621,6 +32623,7 @@ package android.util { method public void setTo(android.util.DisplayMetrics); method public void setToDefaults(); field public static final int DENSITY_400 = 400; // 0x190 + field public static final int DENSITY_560 = 560; // 0x230 field public static final int DENSITY_DEFAULT = 160; // 0xa0 field public static final int DENSITY_HIGH = 240; // 0xf0 field public static final int DENSITY_LOW = 120; // 0x78 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 diff --git a/core/java/android/service/voice/VoiceInteractionServiceInfo.java b/core/java/android/service/voice/VoiceInteractionServiceInfo.java index bacda04..0d2f863 100644 --- a/core/java/android/service/voice/VoiceInteractionServiceInfo.java +++ b/core/java/android/service/voice/VoiceInteractionServiceInfo.java @@ -99,6 +99,10 @@ public class VoiceInteractionServiceInfo { mParseError = "No sessionService specified"; return; } + if (mRecognitionService == null) { + mParseError = "No recogitionService specified"; + return; + } } catch (XmlPullParserException e) { mParseError = "Error parsing voice interation service meta-data: " + e; Log.w(TAG, "error parsing voice interaction service meta-data", e); diff --git a/core/java/android/util/ArrayMap.java b/core/java/android/util/ArrayMap.java index 9a0b7fc..3bdd58a 100644 --- a/core/java/android/util/ArrayMap.java +++ b/core/java/android/util/ArrayMap.java @@ -410,7 +410,7 @@ public final class ArrayMap<K, V> implements Map<K, V> { /** * Add a new value to the array map. - * @param key The key under which to store the value. <b>Must not be null.</b> If + * @param key The key under which to store the value. If * this key already exists in the array, its value will be replaced. * @param value The value to store for the given key. * @return Returns the old value that was stored for the given key, or null if there diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java index 3f10b92..946a3f7 100644 --- a/core/java/android/util/DisplayMetrics.java +++ b/core/java/android/util/DisplayMetrics.java @@ -68,7 +68,7 @@ public class DisplayMetrics { /** * Intermediate density for screens that sit somewhere between - * {@link #DENSITY_XHIGH} (320dpi) and {@link #DENSITY_XXHIGH} (480 dpi). + * {@link #DENSITY_XHIGH} (320 dpi) and {@link #DENSITY_XXHIGH} (480 dpi). * This is not a density that applications should target, instead relying * on the system to scale their {@link #DENSITY_XXHIGH} assets for them. */ @@ -80,6 +80,14 @@ public class DisplayMetrics { public static final int DENSITY_XXHIGH = 480; /** + * Intermediate density for screens that sit somewhere between + * {@link #DENSITY_XXHIGH} (480 dpi) and {@link #DENSITY_XXXHIGH} (560 dpi). + * This is not a density that applications should target, instead relying + * on the system to scale their {@link #DENSITY_XXXHIGH} assets for them. + */ + public static final int DENSITY_560 = 560; + + /** * Standard quantized DPI for extra-extra-extra-high-density screens. Applications * should not generally worry about this density; relying on XHIGH graphics * being scaled up to it should be sufficient for almost all cases. A typical diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index e81ec69..7f68492 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -6851,9 +6851,11 @@ its {@link android.service.voice.VoiceInteractionService#SERVICE_META_DATA} meta-data entry. Described here are the attributes that can be included in that tag. --> <declare-styleable name="VoiceInteractionService"> - <!-- The service that hosts active voice interaction sessions. --> + <!-- The service that hosts active voice interaction sessions. This is required. --> <attr name="sessionService" format="string" /> - <!-- The service that provides voice recognition. --> + <!-- The service that provides voice recognition. This is required. When the user + selects this voice interaction service, they will also be implicitly selecting + the component here for their recognition service. --> <attr name="recognitionService" format="string" /> <attr name="settingsActivity" /> </declare-styleable> |