Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3fb40d5 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

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
parent e25547b3

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -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

core/java/android/provider/Settings.java

+30 −1
Original line number Diff line number Diff line
@@ -169,6 +169,20 @@ public final class Settings { 
    public static final String ACTION_ACCESSIBILITY_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.
@@ -360,6 +374,21 @@ public final class Settings { 
    public static final String ACTION_LOCALE_SETTINGS =

            "android.settings.LOCALE_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_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.
@@ -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

core/java/android/service/voice/VoiceInteractionServiceInfo.java

+4 −0
Original line number Diff line number Diff line
@@ -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);

core/java/android/util/ArrayMap.java

+1 −1
Original line number Diff line number Diff line
@@ -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

core/java/android/util/DisplayMetrics.java

+9 −1
Original line number Diff line number Diff line
@@ -79,6 +79,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