diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-08-31 19:07:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-31 19:07:31 -0700 |
| commit | a329aef43f1d059cb58d1987fd20b63b8b76c43d (patch) | |
| tree | ac79a1d3f1d5394b2bc7cc45204bc808842c9e69 /core/java/android/provider | |
| parent | ec438e1448ebc578ee5a4c4beb1e26292cdedd6e (diff) | |
| parent | 042e9bd989d9c78e23ed29011b6532743f510625 (diff) | |
| download | frameworks_base-a329aef43f1d059cb58d1987fd20b63b8b76c43d.zip frameworks_base-a329aef43f1d059cb58d1987fd20b63b8b76c43d.tar.gz frameworks_base-a329aef43f1d059cb58d1987fd20b63b8b76c43d.tar.bz2 | |
am 042e9bd9: Add SIP related settings in the Settings.System.
Merge commit '042e9bd989d9c78e23ed29011b6532743f510625' into gingerbread-plus-aosp
* commit '042e9bd989d9c78e23ed29011b6532743f510625':
Add SIP related settings in the Settings.System.
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 39 |
1 files changed, 38 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ebc85d3..f5fad4d 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1694,6 +1694,41 @@ public final class Settings { public static final String UNLOCK_SOUND = "unlock_sound"; /** + * 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,7 +1788,9 @@ public final class Settings { DOCK_SOUNDS_ENABLED, LOCKSCREEN_SOUNDS_ENABLED, SHOW_WEB_SUGGESTIONS, - NOTIFICATION_LIGHT_PULSE + NOTIFICATION_LIGHT_PULSE, + SIP_CALL_OPTIONS, + SIP_RECEIVE_CALLS }; // Settings moved to Settings.Secure |