summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Zhamaitsiak <pavelz@google.com>2015-03-09 16:58:39 -0700
committerPavel Zhamaitsiak <pavelz@google.com>2015-03-09 16:58:39 -0700
commit248b8fd7bf46c80d06e36aa9328c6fd0e0d326ce (patch)
treec6422fa21384bf1d63a5723bf0ccc42b6d0cc9c6
parent71099329cc0443ce4517480c86f81ed6b4e33ff2 (diff)
downloadpackages_apps_Settings-248b8fd7bf46c80d06e36aa9328c6fd0e0d326ce.zip
packages_apps_Settings-248b8fd7bf46c80d06e36aa9328c6fd0e0d326ce.tar.gz
packages_apps_Settings-248b8fd7bf46c80d06e36aa9328c6fd0e0d326ce.tar.bz2
Update Wi-Fi Calling mode when WFC is enabled/disabled
Bug: 19644042 Change-Id: Ie9cfe8c7f416985e4f78d48159d83191a19ac599
-rw-r--r--src/com/android/settings/WifiCallingSettings.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 2e8fb74..23fc2ea 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -137,7 +137,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
int wfcMode = ImsManager.getWfcMode(context);
mButtonWfcMode.setValue(Integer.toString(wfcMode));
- mButtonWfcMode.setSummary(getWfcModeSummary(context, ImsManager.getWfcMode(context)));
+ mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));
mButtonWfcRoam.setChecked(wfcEnabled
&& (wfcMode != ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY)
@@ -165,9 +165,10 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
ImsManager.setWfcSetting(context, isChecked);
+ int wfcMode = ImsManager.getWfcMode(context);
+ mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));
mButtonWfcMode.setEnabled(isChecked);
- boolean wfcHandoffEnabled = (ImsManager.getWfcMode(context)
- != ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY);
+ boolean wfcHandoffEnabled = (wfcMode != ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY);
mButtonWfcRoam.setEnabled(isChecked && wfcHandoffEnabled);
mButtonWfcRoam.setChecked(isChecked && wfcHandoffEnabled
&& ImsManager.isWfcRoamingEnabledByUser(context));