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

Merge "Revert "Modify the privacy controller to be selectable in the next updateState()""

Browse Source
This commit is contained in:
TreeHugger Robot
2020-10-20 03:20:36 +00:00
committed by Android (Google) Code Review
parent c52961b5b9 67f95bfd2f
commit 886fe1e6ab
4 changed files with 5 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
View File

@@ -255,11 +255,6 @@ public class WifiNetworkDetailsFragment2 extends DashboardFragment implements
* API call for refreshing the preferences in this fragment.
*/
public void refreshPreferences() {
updatePreferenceStates();
displayPreferenceControllers();
}
protected void displayPreferenceControllers() {
final PreferenceScreen screen = getPreferenceScreen();
for (AbstractPreferenceController controller : mControllers) {
// WifiDetailPreferenceController2 gets the callback WifiEntryCallback#onUpdated,

10
src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
View File

@@ -69,12 +69,12 @@ public class WifiPrivacyPreferenceController2 extends BasePreferenceController i
public void updateState(Preference preference) {
final DropDownPreference dropDownPreference = (DropDownPreference) preference;
final int randomizationLevel = getRandomizationValue();
final boolean isSelectable = mWifiEntry.canSetPrivacy();
preference.setSelectable(isSelectable);
dropDownPreference.setValue(Integer.toString(randomizationLevel));
if (isSelectable) {
updateSummary(dropDownPreference, randomizationLevel);
} else {
updateSummary(dropDownPreference, randomizationLevel);
// Makes preference not selectable, when this is a ephemeral network.
if (!mWifiEntry.canSetPrivacy()) {
preference.setSelectable(false);
dropDownPreference.setSummary(R.string.wifi_privacy_settings_ephemeral_summary);
}
}