PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Wi-Fi Calling mode when WFC is enabled/disabled

Browse Source 
automerge: 248b8fd

* commit '248b8fd7bf46c80d06e36aa9328c6fd0e0d326ce':
  Update Wi-Fi Calling mode when WFC is enabled/disabled
This commit is contained in:
Pavel Zhamaitsiak
2015-03-10 16:57:44 +00:00
committed by android-build-merger
parent 128e25cec0 248b8fd7bf
commit a58527d552
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/WifiCallingSettings.java
View File

@@ -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));