Reorganize phone account settings.
+ Added new fragment for phone account settings.
+ Added new activity for phone account settings, which launches this
fragment. I would have prefered to specify a fragment on the
PreferenceScreen in call_feature_setting.xml, but I couldn't get it
to work so I dispatch an intent to start a new activity instead. I
think the preferred option doesn't work because CallFeatureSetting
is still stuck in the old PreferenceActivity model.
+ Added new activity to the manifest file.
+ Moved the default outgoing call, call assistant, and "use SIP
calling settings" into new PhoneAccountSettingsFragment.
- Deleting code for implementing those in CallFeaturesSetting.
+ Added code to AccountSelectionPreference to disable updating of the
summary, and firing and event after the value has been changed when
an account is selected.
Bug: 17487262
Change-Id: I126806ef8e70f8323a7ff143863dacffeb502eaa
diff --git a/sip/res/xml/sip_setting.xml b/sip/res/xml/sip_setting.xml
index f66e5e4..91b8311 100644
--- a/sip/res/xml/sip_setting.xml
+++ b/sip/res/xml/sip_setting.xml
@@ -14,13 +14,13 @@
limitations under the License.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/sip_accounts">
+ android:title="@string/sip_accounts">
<CheckBoxPreference
- android:key="sip_receive_calls_key"
- android:title="@string/sip_receive_calls"
- android:summary="@string/sip_receive_calls_summary"
- android:persistent="true"/>
+ android:key="sip_receive_calls_key"
+ android:title="@string/sip_receive_calls"
+ android:summary="@string/sip_receive_calls_summary"
+ android:persistent="true"/>
<PreferenceCategory android:key="sip_account_list" android:title="@string/sip_account_list"/>
diff --git a/sip/res/xml/sip_settings_category.xml b/sip/res/xml/sip_settings_category.xml
index 9527d6a..035a539 100644
--- a/sip/res/xml/sip_settings_category.xml
+++ b/sip/res/xml/sip_settings_category.xml
@@ -21,31 +21,16 @@
android:title="@string/sip_settings"
android:persistent="false" >
- <PreferenceScreen
- android:key="sip_account_settings_key"
- android:title="@string/sip_accounts_title"
- android:persistent="false">
+ <PreferenceScreen
+ android:key="sip_account_settings_key"
+ android:title="@string/sip_accounts_title"
+ android:persistent="false">
- <intent android:action="android.intent.action.MAIN"
- android:targetPackage="com.android.phone"
- android:targetClass="com.android.services.telephony.sip.SipSettings" />
+ <intent android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.phone"
+ android:targetClass="com.android.services.telephony.sip.SipSettings" />
- </PreferenceScreen>
-
- <ListPreference
- android:key="sip_call_options_key"
- android:title="@string/sip_call_options_title"
- android:persistent="true"
- android:entries="@array/sip_call_options_entries"
- android:entryValues="@array/sip_call_options_values"/>
-
- <ListPreference
- android:key="sip_call_options_wifi_only_key"
- android:title="@string/sip_call_options_title"
- android:dialogTitle="@string/sip_call_options_wifi_only_title"
- android:persistent="true"
- android:entries="@array/sip_call_options_wifi_only_entries"
- android:entryValues="@array/sip_call_options_values"/>
+ </PreferenceScreen>
</PreferenceScreen>