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

Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev

Browse Source
This commit is contained in:
Pavel Zhamaitsiak
2015-07-23 16:54:55 +00:00
committed by Android (Google) Code Review
parent 838c843217 3e7e2c57d4
commit d9e0ed1b3e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,11 +237,7 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference); mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam); mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
if (ImsManager.isWfcEnabledByPlatform(activity)) { mButtonWfc = (PreferenceScreen) findPreference(KEY_WFC_SETTINGS);
mButtonWfc = (PreferenceScreen) findPreference(KEY_WFC_SETTINGS);
} else {
removePreference(KEY_WFC_SETTINGS);
}
// Remove NSD checkbox by default // Remove NSD checkbox by default
getPreferenceScreen().removePreference(nsd); getPreferenceScreen().removePreference(nsd);
@@ -373,10 +369,15 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
mNsdEnabler.resume(); mNsdEnabler.resume();
} }
// update WFC setting
final Context context = getActivity(); final Context context = getActivity();
if (ImsManager.isWfcEnabledByPlatform(context)) { if (ImsManager.isWfcEnabledByPlatform(context)) {
getPreferenceScreen().addPreference(mButtonWfc);
mButtonWfc.setSummary(WifiCallingSettings.getWfcModeSummary( mButtonWfc.setSummary(WifiCallingSettings.getWfcModeSummary(
context, ImsManager.getWfcMode(context))); context, ImsManager.getWfcMode(context)));
} else {
removePreference(KEY_WFC_SETTINGS);
} }
} }