diff options
| author | Pavel Zhamaitsiak <pavelz@google.com> | 2015-07-23 16:54:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-23 16:54:55 +0000 |
| commit | d9e0ed1b3e8d1584496d041a1081aaea9fdc7d41 (patch) | |
| tree | 76aa5121c94d4589e1e94d7e6178ede99bed7558 /src | |
| parent | 838c843217c76418e5f65b38f40e6b39760de1e4 (diff) | |
| parent | 3e7e2c57d4074d707161cea0736678311ff5b22e (diff) | |
| download | packages_apps_Settings-d9e0ed1b3e8d1584496d041a1081aaea9fdc7d41.zip packages_apps_Settings-d9e0ed1b3e8d1584496d041a1081aaea9fdc7d41.tar.gz packages_apps_Settings-d9e0ed1b3e8d1584496d041a1081aaea9fdc7d41.tar.bz2 | |
Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/WirelessSettings.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index 32d50bf..8cc98cc 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -237,11 +237,7 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference); mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam); - if (ImsManager.isWfcEnabledByPlatform(activity)) { - mButtonWfc = (PreferenceScreen) findPreference(KEY_WFC_SETTINGS); - } else { - removePreference(KEY_WFC_SETTINGS); - } + mButtonWfc = (PreferenceScreen) findPreference(KEY_WFC_SETTINGS); // Remove NSD checkbox by default getPreferenceScreen().removePreference(nsd); @@ -373,10 +369,15 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde mNsdEnabler.resume(); } + // update WFC setting final Context context = getActivity(); if (ImsManager.isWfcEnabledByPlatform(context)) { + getPreferenceScreen().addPreference(mButtonWfc); + mButtonWfc.setSummary(WifiCallingSettings.getWfcModeSummary( context, ImsManager.getWfcMode(context))); + } else { + removePreference(KEY_WFC_SETTINGS); } } |