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/res/xml/phone_account_settings.xml b/res/xml/phone_account_settings.xml
new file mode 100644
index 0000000..7c34b93
--- /dev/null
+++ b/res/xml/phone_account_settings.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:phone="http://schemas.android.com/apk/res/com.android.phone"
+ android:title="@string/phone_account_settings">
+
+ <com.android.phone.settings.AccountSelectionPreference
+ android:key="default_outgoing_account"
+ android:title="@string/phone_accounts_make_calls_with"
+ android:defaultValue=""
+ android:persistent="false" />
+
+ <PreferenceCategory
+ android:key="phone_accounts_call_assistant_settings_category_key"
+ android:title="@string/wifi_calling_call_assistant"
+ android:persistent="false">
+
+ <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" />
+
+ <Preference
+ android:key="wifi_calling_configure_call_assistant_preference"
+ android:title="@string/wifi_calling_call_assistant_configure"
+ android:persistent="false" />
+
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:key="phone_accounts_sip_settings_category_key"
+ android:title="@string/sip_settings"
+ android:persistent="false">
+
+ <ListPreference
+ android:key="use_sip_calling_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"/>
+
+ </PreferenceCategory>
+
+</PreferenceScreen>