summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/WifiCallingSettings.java
diff options
context:
space:
mode:
authorPavel Zhamaitsiak <pavelz@google.com>2015-04-15 16:12:55 -0700
committerPavel Zhamaitsiak <pavelz@google.com>2015-04-15 16:12:55 -0700
commita4314a5d8b5959bc81ce9fc28fb902ed9ecf6cef (patch)
tree822aeb1fd60c9095204e8999fb01624d063754d9 /src/com/android/settings/WifiCallingSettings.java
parenta72c266d5de51188666435ca1fc1e5c2754ef033 (diff)
downloadpackages_apps_Settings-a4314a5d8b5959bc81ce9fc28fb902ed9ecf6cef.zip
packages_apps_Settings-a4314a5d8b5959bc81ce9fc28fb902ed9ecf6cef.tar.gz
packages_apps_Settings-a4314a5d8b5959bc81ce9fc28fb902ed9ecf6cef.tar.bz2
Fix missing text message when WiFi Calling is Off.
Bug: 20124534 Change-Id: I5221c942e7dc43e9fd5c824bb53f69c3da4b229d
Diffstat (limited to 'src/com/android/settings/WifiCallingSettings.java')
-rw-r--r--src/com/android/settings/WifiCallingSettings.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 5167ab0..740dc9f 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -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);