Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e936774f authored by Johnson Lu's avatar Johnson Lu
Browse files

Adjust Wifi Privacy preference. 

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

Bug: 1227787
Test: RunSettingsRoboTests
Change-Id: Iff422eb870e661ceda5ae04f55de802a91f08aeb
parent deb0000d

src/com/android/settings/wifi/WifiConfigController.java

+13 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.text.Editable; 
import android.text.InputType;

import android.text.TextUtils;

import android.text.TextWatcher;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.view.KeyEvent;

import android.view.View;
@@ -155,6 +156,7 @@ public class WifiConfigController implements TextWatcher, 
    private Spinner mProxySettingsSpinner;

    private Spinner mMeteredSettingsSpinner;

    private Spinner mHiddenSettingsSpinner;

    private Spinner mPrivacySettingsSpinner;

    private TextView mHiddenWarningView;

    private TextView mProxyHostView;

    private TextView mProxyPortView;
@@ -220,6 +222,12 @@ public class WifiConfigController implements TextWatcher, 
        mSharedCheckBox = (CheckBox) mView.findViewById(R.id.shared);

        mMeteredSettingsSpinner = mView.findViewById(R.id.metered_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);

        mHiddenWarningView = mView.findViewById(R.id.hidden_settings_warning);

        mHiddenWarningView.setVisibility(
@@ -261,6 +269,7 @@ public class WifiConfigController implements TextWatcher, 
                mHiddenSettingsSpinner.setSelection(config.hiddenSSID

                        ? HIDDEN_NETWORK

                        : NOT_HIDDEN_NETWORK);

                //TODO(b/117957974): set MAC randomization value to mPrivacySettingsSpinner

                if (config.getIpAssignment() == IpAssignment.STATIC) {

                    mIpSettingsSpinner.setSelection(STATIC_IP);

                    showAdvancedFields = true;
@@ -702,6 +711,10 @@ public class WifiConfigController implements TextWatcher, 
            config.meteredOverride = mMeteredSettingsSpinner.getSelectedItemPosition();

        }



        if (mPrivacySettingsSpinner != null) {

            //TODO(b/117957974): set MAC randomization value to WifiConfiguration

        }



        return config;

    }

src/com/android/settings/wifi/WifiDialog.java

+0 −9
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.settings.wifi; 
import android.content.Context;

import android.content.DialogInterface;

import android.os.Bundle;

import android.util.FeatureFlagUtils;

import android.view.View;

import android.widget.Button;
@@ -94,14 +93,6 @@ public class WifiDialog extends AlertDialog implements WifiConfigUiBase, 
        if (mAccessPoint == null) {

            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) {