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

Merge "[Mac Randomization] Change order of Privacy setting"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-21 04:33:27 +00:00
committed by Android (Google) Code Review
parent 5cddabf808 29140c3a29
commit 41ab200713
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java
View File

@@ -61,7 +61,7 @@ public class WifiPrivacyPreferenceController extends BasePreferenceController im
final DropDownPreference dropDownPreference = (DropDownPreference) preference;
final int randomizationLevel = getRandomizationValue();
dropDownPreference.setValue(Integer.toString(randomizationLevel));
updateSummary((DropDownPreference) preference, randomizationLevel);
updateSummary(dropDownPreference, randomizationLevel);
}
@Override
@@ -85,7 +85,20 @@ public class WifiPrivacyPreferenceController extends BasePreferenceController im
return WifiConfiguration.RANDOMIZATION_PERSISTENT;
}
private final int PREF_RANDOMIZATION_PERSISTENT = 0;
private final int PREF_RANDOMIZATION_NONE = 1;
@VisibleForTesting
protected int translateMacRandomizedValueToPrefValue(int macRandomized) {
if (macRandomized == WifiConfiguration.RANDOMIZATION_PERSISTENT) {
return PREF_RANDOMIZATION_PERSISTENT;
} else {
return PREF_RANDOMIZATION_NONE;
}
}
private void updateSummary(DropDownPreference preference, int macRandomized) {
preference.setSummary(preference.getEntries()[macRandomized]);
// Translates value here to set RANDOMIZATION_PERSISTENT as first item in UI for better UX.
final int prefMacRandomized = translateMacRandomizedValueToPrefValue(macRandomized);
preference.setSummary(preference.getEntries()[prefMacRandomized]);
}
}