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

Merge \"WiFiCallingSettings: \"Update Emergency Address\" shouldn\'t be disabled.\" into nyc-mr1-dev

Browse Source 
am: b831223dea

Change-Id: I1dcab97d1dc6e45c6ed5c88caa57156ce5a26b7d
This commit is contained in:
Meng Wang
2016-06-30 02:48:17 +00:00
committed by android-build-merger
parent e5f78124b8 b831223dea
commit f68b06a6a0
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,12 +96,24 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
Preference pref = getPreferenceScreen().findPreference(BUTTON_WFC_MODE);
if (pref != null) {
pref.setEnabled(isWfcEnabled
pref.setEnabled(isWfcEnabled && getEditableWfcMode(activity)
&& (state == TelephonyManager.CALL_STATE_IDLE));
}
}
};
private static boolean getEditableWfcMode(Context context) {
CarrierConfigManager configManager = (CarrierConfigManager)
context.getSystemService(Context.CARRIER_CONFIG_SERVICE);
if (configManager != null) {
PersistableBundle b = configManager.getConfig();
if (b != null) {
return b.getBoolean(CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL);
}
}
return true;
}
private final OnPreferenceClickListener mUpdateAddressListener =
new OnPreferenceClickListener() {
/*
@@ -346,7 +358,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
private void updateButtonWfcMode(Context context, boolean wfcEnabled, int wfcMode) {
mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));
mButtonWfcMode.setEnabled(wfcEnabled);
mButtonWfcMode.setEnabled(wfcEnabled && mEditableWfcMode);
final PreferenceScreen preferenceScreen = getPreferenceScreen();
boolean updateAddressEnabled = (getCarrierActivityIntent(context) != null);
@@ -361,7 +373,6 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
preferenceScreen.removePreference(mButtonWfcMode);
preferenceScreen.removePreference(mUpdateAddress);
}
preferenceScreen.setEnabled(mEditableWfcMode);
}
@Override