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

Merge \\"Hide \\'Update Emergecy Address\\' preference w/o carrier support\\" into nyc-mr1-dev am: 2a817d97fe

Browse Source 
am: 8008dee36c

Change-Id: I5551238b5fc0eee189c0183aec7d7addacad678c
This commit is contained in:
Meng Wang
2016-06-18 04:15:55 +00:00
committed by android-build-merger
parent 39d2e1f916 8008dee36c
commit ffb4f8a058
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -349,9 +349,12 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
mButtonWfcMode.setEnabled(wfcEnabled); mButtonWfcMode.setEnabled(wfcEnabled);
final PreferenceScreen preferenceScreen = getPreferenceScreen(); final PreferenceScreen preferenceScreen = getPreferenceScreen();
boolean updateAddressEnabled = (getCarrierActivityIntent(context) != null);
if (wfcEnabled) { if (wfcEnabled) {
preferenceScreen.addPreference(mButtonWfcMode); preferenceScreen.addPreference(mButtonWfcMode);
if (updateAddressEnabled) {
preferenceScreen.addPreference(mUpdateAddress); preferenceScreen.addPreference(mUpdateAddress);
}
} else { } else {
preferenceScreen.removePreference(mButtonWfcMode); preferenceScreen.removePreference(mButtonWfcMode);
preferenceScreen.removePreference(mUpdateAddress); preferenceScreen.removePreference(mUpdateAddress);