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

Fix missing text message when WiFi Calling is Off.

Browse Source 
Bug: 20124534
Change-Id: I5221c942e7dc43e9fd5c824bb53f69c3da4b229d
This commit is contained in:
Pavel Zhamaitsiak
2015-04-15 16:12:55 -07:00
parent a72c266d5d
commit a4314a5d8b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,10 +172,9 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
boolean wfcEnabled = ImsManager.isWfcEnabledByUser(context) boolean wfcEnabled = ImsManager.isWfcEnabledByUser(context)
&& ImsManager.isNonTtyOrTtyOnVolteEnabled(context); && ImsManager.isNonTtyOrTtyOnVolteEnabled(context);
mSwitch.setChecked(wfcEnabled); mSwitch.setChecked(wfcEnabled);
int wfcMode = ImsManager.getWfcMode(context); int wfcMode = ImsManager.getWfcMode(context);
mButtonWfcMode.setValue(Integer.toString(wfcMode)); mButtonWfcMode.setValue(Integer.toString(wfcMode));
mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode)); updateButtonWfcMode(context, wfcEnabled, wfcMode);
context.registerReceiver(mIntentReceiver, mIntentFilter); context.registerReceiver(mIntentReceiver, mIntentFilter);
@@ -211,11 +210,15 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
ImsManager.setWfcSetting(context, isChecked); ImsManager.setWfcSetting(context, isChecked);
int wfcMode = ImsManager.getWfcMode(context); int wfcMode = ImsManager.getWfcMode(context);
updateButtonWfcMode(context, isChecked, wfcMode);
}
private void updateButtonWfcMode(Context context, boolean wfcEnabled, int wfcMode) {
mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode)); mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));
mButtonWfcMode.setEnabled(isChecked); mButtonWfcMode.setEnabled(wfcEnabled);
final PreferenceScreen preferenceScreen = getPreferenceScreen(); final PreferenceScreen preferenceScreen = getPreferenceScreen();
if (isChecked) { if (wfcEnabled) {
preferenceScreen.addPreference(mButtonWfcMode); preferenceScreen.addPreference(mButtonWfcMode);
} else { } else {
preferenceScreen.removePreference(mButtonWfcMode); preferenceScreen.removePreference(mButtonWfcMode);