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

Commit b3222875 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 60a0ad65: Merge change 5329 into donut 

Merge commit '60a0ad65'

* commit '60a0ad65':
  frameworks/base - CDMA settings additions
parents c0767064 60a0ad65

core/java/android/provider/Settings.java

+44 −0
Original line number Diff line number Diff line
@@ -1289,6 +1289,50 @@ public final class Settings { 
         */

        public static final String DTMF_TONE_WHEN_DIALING = "dtmf_tone";



        /**

         * CDMA only settings

         * DTMF tone type played by the dialer when dialing.

         *                 0 = Normal

         *                 1 = Long

         * @hide

         */

        public static final String DTMF_TONE_TYPE_WHEN_DIALING = "dtmf_tone_type";



        /**

         * CDMA only settings

         * Emergency Tone  0 = Off

         *                 1 = Alert

         *                 2 = Vibrate

         * @hide

         */

        public static final String EMERGENCY_TONE = "emergency_tone";



        /**

         * CDMA only settings

         * Whether the auto retry is enabled. The value is

         * boolean (1 or 0).

         * @hide

         */

        public static final String CALL_AUTO_RETRY = "call_auto_retry";



        /**

         * Whether the hearing aid is enabled. The value is

         * boolean (1 or 0).

         * @hide

         */

        public static final String HEARING_AID = "hearing_aid";



        /**

         * CDMA only settings

         * TTY Mode

         * 0 = OFF

         * 1 = FULL

         * 2 = VCO

         * 3 = HCO

         * @hide

         */

        public static final String TTY_MODE = "tty_mode";



        /**

         * Whether the sounds effects (key clicks, lid open ...) are enabled. The value is

         * boolean (1 or 0).

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+15 −0
Original line number Diff line number Diff line
@@ -592,6 +592,21 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
        loadIntegerSetting(stmt, Settings.System.SCREEN_OFF_TIMEOUT,

                R.integer.def_screen_off_timeout);



        // Set default cdma emergency tone

        loadSetting(stmt, Settings.System.EMERGENCY_TONE, 0);



        // Set default cdma call auto retry

        loadSetting(stmt, Settings.System.CALL_AUTO_RETRY, 0);



        // Set default cdma DTMF type

        loadSetting(stmt, Settings.System.DTMF_TONE_TYPE_WHEN_DIALING, 0);



        // Set default hearing aid

        loadSetting(stmt, Settings.System.HEARING_AID, 0);



        // Set default tty mode

        loadSetting(stmt, Settings.System.TTY_MODE, 0);



        loadBooleanSetting(stmt, Settings.System.AIRPLANE_MODE_ON,

                R.bool.def_airplane_mode_on);