diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-18 22:26:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-18 22:26:25 -0700 |
| commit | 2f11599eb317887a8cca14d8e66bfc485e5169e7 (patch) | |
| tree | aff8975073de4d008a513466f6d53385a0189e89 /core/java/android/provider | |
| parent | 15e74b9da8b4cda11ee54da1e77a02d1a86c944a (diff) | |
| parent | e9b06d754af03faf27012fbed1e7559ec1ba7c79 (diff) | |
| download | frameworks_base-2f11599eb317887a8cca14d8e66bfc485e5169e7.zip frameworks_base-2f11599eb317887a8cca14d8e66bfc485e5169e7.tar.gz frameworks_base-2f11599eb317887a8cca14d8e66bfc485e5169e7.tar.bz2 | |
Merge change 1579 into donut
* changes:
Teleca 2b changes
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ed5520d..2a47b42 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2069,15 +2069,31 @@ public final class Settings { public static final String CURRENT_ACTIVE_PHONE = "current_active_phone"; /** - * The preferred network mode 7 = Global, CDMA default - * 4 = CDMA only - * 3 = GSM/UMTS only + * The preferred network mode 7 = Global + * 6 = EvDo only + * 5 = CDMA w/o EvDo + * 4 = CDMA / EvDo auto + * 3 = GSM / WCDMA auto + * 2 = WCDMA only + * 1 = GSM only + * 0 = GSM / WCDMA preferred * @hide */ public static final String PREFERRED_NETWORK_MODE = "preferred_network_mode"; /** + * The preferred TTY mode 0 = TTy Off, CDMA default + * 1 = TTY Full + * 2 = TTY HCO + * 3 = TTY VCO + * @hide + */ + public static final String PREFERRED_TTY_MODE = + "preferred_tty_mode"; + + + /** * CDMA Cell Broadcast SMS * 0 = CDMA Cell Broadcast SMS disabled * 1 = CDMA Cell Broadcast SMS enabled |