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 
automerge: a4314a5

* commit 'a4314a5d8b5959bc81ce9fc28fb902ed9ecf6cef':
  Fix missing text message when WiFi Calling is Off.
This commit is contained in:
Pavel Zhamaitsiak
2015-04-15 23:44:43 +00:00
committed by android-build-merger
parent 22ffff6a6d a4314a5d8b
commit 6fcb62fbda
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)
&& ImsManager.isNonTtyOrTtyOnVolteEnabled(context);
mSwitch.setChecked(wfcEnabled);
int wfcMode = ImsManager.getWfcMode(context);
mButtonWfcMode.setValue(Integer.toString(wfcMode));
mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));
updateButtonWfcMode(context, wfcEnabled, wfcMode);
context.registerReceiver(mIntentReceiver, mIntentFilter);
@@ -211,11 +210,15 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
ImsManager.setWfcSetting(context, isChecked);
int wfcMode = ImsManager.getWfcMode(context);
updateButtonWfcMode(context, isChecked, wfcMode);
}
private void updateButtonWfcMode(Context context, boolean wfcEnabled, int wfcMode) {
mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));
mButtonWfcMode.setEnabled(isChecked);
mButtonWfcMode.setEnabled(wfcEnabled);
final PreferenceScreen preferenceScreen = getPreferenceScreen();
if (isChecked) {
if (wfcEnabled) {
preferenceScreen.addPreference(mButtonWfcMode);
} else {
preferenceScreen.removePreference(mButtonWfcMode);