Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 042e9bd9: Add SIP related settings in the Settings.System.

Browse Source 
Merge commit '042e9bd989d9c78e23ed29011b6532743f510625' into gingerbread-plus-aosp

* commit '042e9bd989d9c78e23ed29011b6532743f510625':
  Add SIP related settings in the Settings.System.
This commit is contained in:
Chung-yih Wang
2010-08-31 19:07:31 -07:00
committed by Android Git Automerger
parent ec438e1448 042e9bd989
commit a329aef43f
1 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
core/java/android/provider/Settings.java
View File

@@ -1693,6 +1693,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.
@@ -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