diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-09-01 11:00:33 +0800 |
|---|---|---|
| committer | Chung-yih Wang <cywang@google.com> | 2010-09-01 11:00:33 +0800 |
| commit | dbecc24a4ed4e9c24fc03db19038ee45cf7a0b1d (patch) | |
| tree | 26d8624db860d7696dc4fb80aada8d81287f9078 /core/java/android/provider | |
| parent | 3927dbb52a99382802f8df8d03fef496a8e0a1ea (diff) | |
| parent | a329aef43f1d059cb58d1987fd20b63b8b76c43d (diff) | |
| download | frameworks_base-dbecc24a4ed4e9c24fc03db19038ee45cf7a0b1d.zip frameworks_base-dbecc24a4ed4e9c24fc03db19038ee45cf7a0b1d.tar.gz frameworks_base-dbecc24a4ed4e9c24fc03db19038ee45cf7a0b1d.tar.bz2 | |
resolved conflicts for merge of a329aef4 to master
Change-Id: I5a64ee2b6adc56a7521d2e55a72e519a284d5a7c
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 57fa463..d1ca723 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1692,6 +1692,41 @@ public final class Settings { public static final String USE_PTP_INTERFACE = "use_ptp_interface"; /** + * Receive incoming SIP calls? + * 0 = no + * 1 = yes + * @hide + */ + public static final String SIP_RECEIVE_CALLS = "sip_receive_calls"; + + /** + * Call Preference String. + * "SIP_ALWAYS" : Always use SIP with network access + * "SIP_ADDRESS_ONLY" : Only if destination is a SIP address + * "SIP_ASK_ME_EACH_TIME" : Always ask me each time + * @hide + */ + public static final String SIP_CALL_OPTIONS = "sip_call_options"; + + /** + * One of the sip call options: Always use SIP with network access. + * @hide + */ + public static final String SIP_ALWAYS = "SIP_ALWAYS"; + + /** + * One of the sip call options: Only if destination is a SIP address. + * @hide + */ + public static final String SIP_ADDRESS_ONLY = "SIP_ADDRESS_ONLY"; + + /** + * One of the sip call options: Always ask me each time. + * @hide + */ + public static final String SIP_ASK_ME_EACH_TIME = "SIP_ASK_ME_EACH_TIME"; + + /** * Settings to backup. This is here so that it's in the same place as the settings * keys and easy to update. * @hide @@ -1753,6 +1788,8 @@ public final class Settings { SHOW_WEB_SUGGESTIONS, NOTIFICATION_LIGHT_PULSE, USE_PTP_INTERFACE, + SIP_CALL_OPTIONS, + SIP_RECEIVE_CALLS }; // Settings moved to Settings.Secure |