summaryrefslogtreecommitdiffstats
path: root/telephony/java/com
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2010-02-11 10:36:10 -0800
committerEric Laurent <elaurent@google.com>2010-02-11 10:38:28 -0800
commitd7b92a0ff395fa45d934eaa4242bf2598da88964 (patch)
tree46a4899a3799321bf8472c4818b54e089ced1560 /telephony/java/com
parent4e208bd8722ad48c342c0128313ef40971234121 (diff)
parent61bb25f2f92af10b685d6bd1452bc5505995c64e (diff)
downloadframeworks_base-d7b92a0ff395fa45d934eaa4242bf2598da88964.zip
frameworks_base-d7b92a0ff395fa45d934eaa4242bf2598da88964.tar.gz
frameworks_base-d7b92a0ff395fa45d934eaa4242bf2598da88964.tar.bz2
resolved conflicts for merge of 61bb25f2 to master
Diffstat (limited to 'telephony/java/com')
-rw-r--r--telephony/java/com/android/internal/telephony/cdma/TtyIntent.java21
1 files changed, 21 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/TtyIntent.java b/telephony/java/com/android/internal/telephony/cdma/TtyIntent.java
index f27f79c..3813b1d 100644
--- a/telephony/java/com/android/internal/telephony/cdma/TtyIntent.java
+++ b/telephony/java/com/android/internal/telephony/cdma/TtyIntent.java
@@ -43,4 +43,25 @@ public class TtyIntent {
*/
public static final String TTY_ENABLED = "ttyEnabled";
+ /**
+ * Broadcast intent action indicating that the TTY preferred operating mode
+ * has changed. An intent extra provides the new mode as an int.
+ * @see #TTY_PREFFERED_MODE
+ *
+ * {@hide}
+ */
+ public static final String TTY_PREFERRED_MODE_CHANGE_ACTION =
+ "com.android.internal.telephony.cdma.intent.action.TTY_PREFERRED_MODE_CHANGE";
+
+ /**
+ * The lookup key for an int that indicates preferred TTY mode.
+ * Valid modes are:
+ * - {@link Phone.TTY_MODE_OFF}
+ * - {@link Phone.TTY_MODE_FULL}
+ * - {@link Phone.TTY_MODE_HCO}
+ * - {@link Phone.TTY_MODE_VCO}
+ *
+ * {@hide}
+ */
+ public static final String TTY_PREFFERED_MODE = "ttyPreferredMode";
}