Move SIP settings to phone account settings.
+ Moved "SIP accounts" and "Receive incoming calls" settings from
the SIP settings creen to the Phone account settings screen.
+ To facilitate this, I moved some helper functions which used to
be in SipSettings to SipUtil. Their logical innards are for the
most part unchanged.
- Removed "SIP settings" preference screen added in call settings.
- Removed "Receive incoming calls" from SipSettings activity.
- Deleted unused SIP settings layout.
+ Changed back button behavior in SIP settings activity so that
back takes it to phone account settings, rather than call feature
settings.
+ Made some necessary classes/functions in sip/ public. Ihab said
that these were this way because of some refactoring at some point,
and it should be fine to make them public to achieve the necessary
class accessibility to facilitate this CL.
Bug: 17487262
Change-Id: I8e24abf624cadf9afc7aeff28781802732fef07d
diff --git a/res/xml/phone_account_settings.xml b/res/xml/phone_account_settings.xml
index 7c34b93..f812885 100644
--- a/res/xml/phone_account_settings.xml
+++ b/res/xml/phone_account_settings.xml
@@ -32,7 +32,7 @@
<com.android.phone.settings.AccountSelectionPreference
android:key="wifi_calling_call_assistant_preference"
android:title="@string/wifi_calling_call_assistant"
- android:summary="@string/wifi_calling_call_assistant_configure_no_selection" />
+ android:summary="@string/wifi_calling_call_assistant_none" />
<Preference
android:key="wifi_calling_configure_call_assistant_preference"
@@ -46,6 +46,16 @@
android:title="@string/sip_settings"
android:persistent="false">
+ <PreferenceScreen
+ android:title="@string/sip_accounts"
+ android:persistent="false">
+
+ <intent android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.phone"
+ android:targetClass="com.android.services.telephony.sip.SipSettings" />
+
+ </PreferenceScreen>
+
<ListPreference
android:key="use_sip_calling_options_key"
android:title="@string/sip_call_options_title"
@@ -53,6 +63,12 @@
android:entries="@array/sip_call_options_entries"
android:entryValues="@array/sip_call_options_values"/>
+ <CheckBoxPreference
+ android:key="sip_receive_calls_key"
+ android:title="@string/sip_receive_calls"
+ android:summary="@string/sip_receive_calls_summary"
+ android:persistent="true"/>
+
</PreferenceCategory>
</PreferenceScreen>