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

Commit 7b0d2d93 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 3223 into donut 

* changes:
  Adding new Settings.Secure properties for the Text-To-Speech functionality. Those properties are secure to prevent applications from altering the user's settings without his knowledge.
parents 47538fe6 f62ba452

api/current.xml

+44 −0
Original line number Diff line number Diff line
@@ -107280,6 +107280,50 @@ 
 visibility="public"

>

</field>

<field name="TTS_DEFAULT_PITCH"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;tts_default_pitch&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TTS_DEFAULT_RATE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;tts_default_rate&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TTS_DEFAULT_SYNTH"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;tts_default_synth&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TTS_USE_DEFAULTS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;tts_use_defaults&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_MASS_STORAGE_ENABLED"

 type="java.lang.String"

 transient="false"

core/java/android/provider/Settings.java

+23 −0
Original line number Diff line number Diff line
@@ -1923,6 +1923,29 @@ public final class Settings { 
        public static final String ENABLED_ACCESSIBILITY_SERVICES =

            "enabled_accessibility_services";



        /**

         * Setting to always use the default text-to-speech settings regardless

         * of the application settings.

         * 1 = override application settings,

         * 0 = use application settings (if specified).

         */

        public static final String TTS_USE_DEFAULTS = "tts_use_defaults";



        /**

         * Default text-to-speech engine speech rate. 100 = 1x

         */

        public static final String TTS_DEFAULT_RATE = "tts_default_rate";



        /**

         * Default text-to-speech engine pitch. 100 = 1x

         */

        public static final String TTS_DEFAULT_PITCH = "tts_default_pitch";



        /**

         * Default text-to-speech engine.

         */

        public static final String TTS_DEFAULT_SYNTH = "tts_default_synth";



        /**

         * Whether to notify the user of open networks.

         * <p>