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

Merge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-18 21:59:16 +00:00
committed by Android (Google) Code Review
parent 6dcab67c0c 4436d6fe16
commit f30ef19dc3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -363,7 +363,12 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
final PreferenceScreen preferenceScreen = getPreferenceScreen(); final PreferenceScreen preferenceScreen = getPreferenceScreen();
boolean updateAddressEnabled = (getCarrierActivityIntent(context) != null); boolean updateAddressEnabled = (getCarrierActivityIntent(context) != null);
if (wfcEnabled) { if (wfcEnabled) {
preferenceScreen.addPreference(mButtonWfcMode); if (mEditableWfcMode) {
preferenceScreen.addPreference(mButtonWfcMode);
} else {
// Don't show WFC mode preference if it's not editable.
preferenceScreen.removePreference(mButtonWfcMode);
}
if (updateAddressEnabled) { if (updateAddressEnabled) {
preferenceScreen.addPreference(mUpdateAddress); preferenceScreen.addPreference(mUpdateAddress);
} else { } else {