Merge "Hide 'Update Emergecy Address' preference w/o carrier support" into nyc-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
2a817d97fe
@@ -349,9 +349,12 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
|
||||
mButtonWfcMode.setEnabled(wfcEnabled);
|
||||
|
||||
final PreferenceScreen preferenceScreen = getPreferenceScreen();
|
||||
boolean updateAddressEnabled = (getCarrierActivityIntent(context) != null);
|
||||
if (wfcEnabled) {
|
||||
preferenceScreen.addPreference(mButtonWfcMode);
|
||||
preferenceScreen.addPreference(mUpdateAddress);
|
||||
if (updateAddressEnabled) {
|
||||
preferenceScreen.addPreference(mUpdateAddress);
|
||||
}
|
||||
} else {
|
||||
preferenceScreen.removePreference(mButtonWfcMode);
|
||||
preferenceScreen.removePreference(mUpdateAddress);
|
||||
|
Reference in New Issue
Block a user