diff options
| author | Pavel Zhamaitsiak <pavelz@google.com> | 2015-03-10 16:57:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-03-10 16:57:44 +0000 |
| commit | a58527d5527b61745f4b51315abaf0e70bab7b4a (patch) | |
| tree | d549455e39faa9e89874685710b3d25a4f0dd4c7 | |
| parent | 128e25cec0a45b8b3620cf47d55527ee591b0f6e (diff) | |
| parent | 248b8fd7bf46c80d06e36aa9328c6fd0e0d326ce (diff) | |
| download | packages_apps_Settings-a58527d5527b61745f4b51315abaf0e70bab7b4a.zip packages_apps_Settings-a58527d5527b61745f4b51315abaf0e70bab7b4a.tar.gz packages_apps_Settings-a58527d5527b61745f4b51315abaf0e70bab7b4a.tar.bz2 | |
Update Wi-Fi Calling mode when WFC is enabled/disabled
automerge: 248b8fd
* commit '248b8fd7bf46c80d06e36aa9328c6fd0e0d326ce':
Update Wi-Fi Calling mode when WFC is enabled/disabled
| -rw-r--r-- | src/com/android/settings/WifiCallingSettings.java | 7 |
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)); |