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

DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable

Browse Source 
Bug: 30947921
Change-Id: I80240fbd912afa9a40cee38070c4e77d5e9d6ae9
(cherry picked from commit 4436d6fe16)
This commit is contained in:
Meng Wang
2016-08-18 12:19:01 -07:00
committed by Adam Seaton
parent 8d9ade8b9c
commit 5ea4bb2f43
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 {