From 4ab32563f1cd7d018ee7cdaec8d5a527964a05b9 Mon Sep 17 00:00:00 2001 From: Pavel Zhamaitsiak Date: Mon, 23 Feb 2015 15:34:07 -0800 Subject: [PATCH] Add Wi-Fi Calling preference screen Change-Id: Ie89902b55c5c4184236636f5039b3246a9c0bda5 --- AndroidManifest.xml | 17 ++ res/values/strings.xml | 29 +++ res/xml/wifi_calling_settings.xml | 34 +++ res/xml/wireless_settings.xml | 5 + src/com/android/settings/Settings.java | 1 + .../android/settings/SettingsActivity.java | 4 +- .../android/settings/WifiCallingSettings.java | 220 ++++++++++++++++++ .../android/settings/WirelessSettings.java | 17 ++ src/com/android/settings/search/Ranking.java | 2 + .../search/SearchIndexableResources.java | 8 + 10 files changed, 336 insertions(+), 1 deletion(-) create mode 100644 res/xml/wifi_calling_settings.xml create mode 100644 src/com/android/settings/WifiCallingSettings.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ad84ff9b60c..e49c6a288df 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2058,6 +2058,23 @@ + + + + + + + + + + + + Configured networks + + Wi-Fi calling + + Wi-Fi calling mode + + Wi-Fi calling mode + + Wi-Fi preferred + Cellular preferred + Wi-Fi only + + + "2" + "1" + "0" + + + Off + + Wi-Fi preferred (Uses cell network only if Wi-Fi isn\'t available) + + Cellular preferred (Uses Wi-Fi only if cell network isn\'t available) + + Wi-Fi only (Never uses cell network. Can\'t make or receive calls if Wi-Fi isn\'t available) + + WFC handoff while roaming + + Allow Wi-Fi voice calls handoff to cell network when roaming + diff --git a/res/xml/wifi_calling_settings.xml b/res/xml/wifi_calling_settings.xml new file mode 100644 index 00000000000..37a2d285ba6 --- /dev/null +++ b/res/xml/wifi_calling_settings.xml @@ -0,0 +1,34 @@ + + + + + + + + + + diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index a5f722b8779..fc3ca16783c 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -63,6 +63,11 @@ android:targetClass="com.android.phone.MobileNetworkSettings" /> + +