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

Browse Source 
am: 2a817d97fe

Change-Id: Iccf8008b7a818bf8327e8e53632326dd0dc41982
This commit is contained in:
Meng Wang
2016-06-18 04:12:40 +00:00
committed by android-build-merger
parent 057f4ae6cc 2a817d97fe
commit 8008dee36c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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);
preferenceScreen.addPreference(mUpdateAddress); if (updateAddressEnabled) {
preferenceScreen.addPreference(mUpdateAddress);
}
} else { } else {
preferenceScreen.removePreference(mButtonWfcMode); preferenceScreen.removePreference(mButtonWfcMode);
preferenceScreen.removePreference(mUpdateAddress); preferenceScreen.removePreference(mUpdateAddress);