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
This commit is contained in:
TreeHugger Robot
2016-06-18 04:02:49 +00:00
committed by Android (Google) Code Review
parent b2728f51fb 184753f64f
commit 2a817d97fe
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);