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 in "Add network" page"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-25 06:03:29 +00:00
committed by Android (Google) Code Review
parent a2a1bb0e51 b521bd6225
commit 88d7797e1b
3 changed files with 93 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -63,6 +63,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.settings.ProxySelector;
import com.android.settings.R;
import com.android.settings.wifi.details.WifiPrivacyPreferenceController;
import com.android.settingslib.Utils;
import com.android.settingslib.utils.ThreadUtils;
import com.android.settingslib.wifi.AccessPoint;
@@ -251,8 +252,6 @@ public class WifiConfigController implements TextWatcher,
com.android.settings.core.FeatureFlags.WIFI_MAC_RANDOMIZATION)) {
View privacySettingsLayout = mView.findViewById(R.id.privacy_settings_fields);
privacySettingsLayout.setVisibility(View.VISIBLE);
// Set default value
mPrivacySettingsSpinner.setSelection(WifiConfiguration.RANDOMIZATION_PERSISTENT);
}
mHiddenSettingsSpinner.setOnItemSelectedListener(this);
mHiddenWarningView = mView.findViewById(R.id.hidden_settings_warning);
@@ -281,7 +280,12 @@ public class WifiConfigController implements TextWatcher,
mHiddenSettingsSpinner.setSelection(config.hiddenSSID
? HIDDEN_NETWORK
: NOT_HIDDEN_NETWORK);
mPrivacySettingsSpinner.setSelection(config.macRandomizationSetting);
final int prefMacValue =
WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
config.macRandomizationSetting);
mPrivacySettingsSpinner.setSelection(prefMacValue);
if (config.getIpAssignment() == IpAssignment.STATIC) {
mIpSettingsSpinner.setSelection(STATIC_IP);
showAdvancedFields = true;
@@ -766,7 +770,10 @@ public class WifiConfigController implements TextWatcher,
}
if (mPrivacySettingsSpinner != null) {
config.macRandomizationSetting = mPrivacySettingsSpinner.getSelectedItemPosition();
final int macValue =
WifiPrivacyPreferenceController.translatePrefValueToMacRandomizedValue(
mPrivacySettingsSpinner.getSelectedItemPosition());
config.macRandomizationSetting = macValue;
}
return config;

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

@@ -85,15 +85,29 @@ 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 static final int PREF_RANDOMIZATION_PERSISTENT = 0;
private static final int PREF_RANDOMIZATION_NONE = 1;
/**
* Returns preference index value.
*
* @param macRandomized is mac randomized value
* @return index value of preference
*/
public static int translateMacRandomizedValueToPrefValue(int macRandomized) {
return (macRandomized == WifiConfiguration.RANDOMIZATION_PERSISTENT)
? PREF_RANDOMIZATION_PERSISTENT : PREF_RANDOMIZATION_NONE;
}
/**
* Returns mac randomized value.
*
* @param prefMacRandomized is preference index value
* @return mac randomized value
*/
public static int translatePrefValueToMacRandomizedValue(int prefMacRandomized) {
return (prefMacRandomized == PREF_RANDOMIZATION_PERSISTENT)
? WifiConfiguration.RANDOMIZATION_PERSISTENT : WifiConfiguration.RANDOMIZATION_NONE;
}
private void updateSummary(DropDownPreference preference, int macRandomized) {