diff options
| author | Pavel Zhamaitsiak <pavelz@google.com> | 2015-03-23 22:11:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-03-23 22:11:57 +0000 |
| commit | 22416075708990c5820fd18de7c028c017c6f1ab (patch) | |
| tree | a07c2fc421dad627720c998536f46942dcd13206 /res | |
| parent | fe475227efdf69a4342a1e393ae60ca01fe9af30 (diff) | |
| parent | ee5f27dbeeef90381de905d05b3b67bc1837df20 (diff) | |
| download | packages_apps_Settings-22416075708990c5820fd18de7c028c017c6f1ab.zip packages_apps_Settings-22416075708990c5820fd18de7c028c017c6f1ab.tar.gz packages_apps_Settings-22416075708990c5820fd18de7c028c017c6f1ab.tar.bz2 | |
Update Wi-Fi Calling settings
automerge: ee5f27d
* commit 'ee5f27dbeeef90381de905d05b3b67bc1837df20':
Update Wi-Fi Calling settings
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 12 | ||||
| -rw-r--r-- | res/xml/wireless_settings.xml | 12 |
2 files changed, 9 insertions, 15 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 65e5e91..4301e39 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1893,7 +1893,7 @@ <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] --> <string name="wifi_calling_settings_title">Wi-Fi calling</string> <!-- WFC mode [CHAR LIMIT=30] --> - <string name="wifi_calling_mode_title">Wi-Fi calling mode</string> + <string name="wifi_calling_mode_title">Calling preference</string> <!-- WFC mode dialog [CHAR LIMIT=30] --> <string name="wifi_calling_mode_dialog_title">Wi-Fi calling mode</string> <string-array name="wifi_calling_mode_choices"> @@ -1906,14 +1906,8 @@ <item>"1"</item> <item>"0"</item> </string-array> - <!-- WFC, summary for Disabled [CHAR LIMIT=100] --> - <string name="wifi_calling_off_summary">Off</string> - <!-- WFC, summary for Wi-Fi Preferred [CHAR LIMIT=100] --> - <string name="wfc_mode_wifi_preferred_summary">Wi-Fi preferred (Uses cell network only if Wi-Fi isn\'t available)</string> - <!-- WFC, summary for Cellular Preferred [CHAR LIMIT=100] --> - <string name="wfc_mode_cellular_preferred_summary">Cellular preferred (Uses Wi-Fi only if cell network isn\'t available)</string> - <!-- WFC, summary for Wi-Fi Only [CHAR LIMIT=100] --> - <string name="wfc_mode_wifi_only_summary">Wi-Fi only (Never uses cell network. Can\'t make or receive calls if Wi-Fi isn\'t available)</string> + <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off --> + <string name="wifi_calling_off_explanation">When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your carrier\'s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your carrier regarding fees and other details.</string> <!-- Sound and alerts settings --> <skip/> diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 7a4ed9a..b615c9e 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -38,6 +38,12 @@ android:persistent="false" /> <PreferenceScreen + android:key="wifi_calling_settings" + android:title="@string/wifi_calling_settings_title" + settings:keywords="@string/keywords_wifi_calling" + android:fragment="com.android.settings.WifiCallingSettings" /> + + <PreferenceScreen android:fragment="com.android.settings.nfc.AndroidBeam" android:key="android_beam_settings" android:title="@string/android_beam_settings_title" /> @@ -63,12 +69,6 @@ android:targetClass="com.android.phone.MobileNetworkSettings" /> </PreferenceScreen> - <PreferenceScreen - android:key="wifi_calling_settings" - android:title="@string/wifi_calling_settings_title" - settings:keywords="@string/keywords_wifi_calling" - android:fragment="com.android.settings.WifiCallingSettings" /> - <Preference android:key="manage_mobile_plan" android:title="@string/manage_mobile_plan_title" |