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

Adjust Wifi Privacy preference.

Browse Source 
Show Wifi MAC Randomization preference in both "Add network" and "Join
Network" flows.

Bug: 1227787
Test: RunSettingsRoboTests
Change-Id: Iff422eb870e661ceda5ae04f55de802a91f08aeb
This commit is contained in:
Johnson Lu
2018-10-22 16:23:54 +08:00
parent deb0000d86
commit e936774fa3
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,7 @@ import android.text.Editable;
import android.text.InputType; import android.text.InputType;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.FeatureFlagUtils;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
@@ -155,6 +156,7 @@ public class WifiConfigController implements TextWatcher,
private Spinner mProxySettingsSpinner; private Spinner mProxySettingsSpinner;
private Spinner mMeteredSettingsSpinner; private Spinner mMeteredSettingsSpinner;
private Spinner mHiddenSettingsSpinner; private Spinner mHiddenSettingsSpinner;
private Spinner mPrivacySettingsSpinner;
private TextView mHiddenWarningView; private TextView mHiddenWarningView;
private TextView mProxyHostView; private TextView mProxyHostView;
private TextView mProxyPortView; private TextView mProxyPortView;
@@ -220,6 +222,12 @@ public class WifiConfigController implements TextWatcher,
mSharedCheckBox = (CheckBox) mView.findViewById(R.id.shared); mSharedCheckBox = (CheckBox) mView.findViewById(R.id.shared);
mMeteredSettingsSpinner = mView.findViewById(R.id.metered_settings); mMeteredSettingsSpinner = mView.findViewById(R.id.metered_settings);
mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings); mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
mPrivacySettingsSpinner = mView.findViewById(R.id.privacy_settings);
if (FeatureFlagUtils.isEnabled(mContext,
com.android.settings.core.FeatureFlags.WIFI_MAC_RANDOMIZATION)) {
View privacySettingsLayout = mView.findViewById(R.id.privacy_settings_fields);
privacySettingsLayout.setVisibility(View.VISIBLE);
}
mHiddenSettingsSpinner.setOnItemSelectedListener(this); mHiddenSettingsSpinner.setOnItemSelectedListener(this);
mHiddenWarningView = mView.findViewById(R.id.hidden_settings_warning); mHiddenWarningView = mView.findViewById(R.id.hidden_settings_warning);
mHiddenWarningView.setVisibility( mHiddenWarningView.setVisibility(
@@ -261,6 +269,7 @@ public class WifiConfigController implements TextWatcher,
mHiddenSettingsSpinner.setSelection(config.hiddenSSID mHiddenSettingsSpinner.setSelection(config.hiddenSSID
? HIDDEN_NETWORK ? HIDDEN_NETWORK
: NOT_HIDDEN_NETWORK); : NOT_HIDDEN_NETWORK);
//TODO(b/117957974): set MAC randomization value to mPrivacySettingsSpinner
if (config.getIpAssignment() == IpAssignment.STATIC) { if (config.getIpAssignment() == IpAssignment.STATIC) {
mIpSettingsSpinner.setSelection(STATIC_IP); mIpSettingsSpinner.setSelection(STATIC_IP);
showAdvancedFields = true; showAdvancedFields = true;
@@ -702,6 +711,10 @@ public class WifiConfigController implements TextWatcher,
config.meteredOverride = mMeteredSettingsSpinner.getSelectedItemPosition(); config.meteredOverride = mMeteredSettingsSpinner.getSelectedItemPosition();
} }
if (mPrivacySettingsSpinner != null) {
//TODO(b/117957974): set MAC randomization value to WifiConfiguration
}
return config; return config;
} }

9
src/com/android/settings/wifi/WifiDialog.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.wifi;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
import android.util.FeatureFlagUtils;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
@@ -94,14 +93,6 @@ public class WifiDialog extends AlertDialog implements WifiConfigUiBase,
if (mAccessPoint == null) { if (mAccessPoint == null) {
mController.hideForgetButton(); mController.hideForgetButton();
} }
if (FeatureFlagUtils.isEnabled(getContext(),
com.android.settings.core.FeatureFlags.WIFI_MAC_RANDOMIZATION)) {
View view = mView.findViewById(R.id.privacy_settings_fields);
if (view != null) {
view.setVisibility(View.VISIBLE);
}
}
} }
public void onRestoreInstanceState(Bundle savedInstanceState) { public void onRestoreInstanceState(Bundle savedInstanceState) {