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

resolved conflicts for merge of a329aef4 to master

Browse Source 
Change-Id: I5a64ee2b6adc56a7521d2e55a72e519a284d5a7c
This commit is contained in:
Chung-yih Wang
2010-09-01 11:00:33 +08:00
parent 3927dbb52a a329aef43f
commit dbecc24a4e
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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