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

Commit 628ebac9 authored by Charlotte Lu's avatar Charlotte Lu
Browse files

Add WEP warning. 

Test: Visual Test
Fix: 318797664
Change-Id: Id713ddf2d805b7ce47fe1e620a3273b86cdb3dfe
parent 739f6ff6

res/layout/wifi_add_network_view.xml

+1 −2
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ 
<androidx.core.widget.NestedScrollView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:fitsSystemWindows="true">

    android:layout_height="wrap_content">

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

res/layout/wifi_network_config.xml

+13 −0
Original line number Diff line number Diff line
@@ -22,6 +22,19 @@ 
    android:orientation="vertical"

    android:paddingBottom="8dip">



    <LinearLayout android:id="@+id/wep_warning_layout"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingBottom="20dp"

        style="@style/wifi_item"

        android:visibility="gone">

        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            style="@style/wifi_item_label"

            android:text="@string/wifi_settings_warning_wep_network"/>

    </LinearLayout>



    <LinearLayout android:id="@+id/info"

                  android:layout_width="match_parent"

                  android:layout_height="wrap_content"

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

+9 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import android.widget.CompoundButton; 
import android.widget.CompoundButton.OnCheckedChangeListener;

import android.widget.EditText;

import android.widget.ImageButton;

import android.widget.LinearLayout;

import android.widget.Spinner;

import android.widget.TextView;
@@ -75,6 +76,8 @@ import com.android.settings.wifi.dpp.WifiDppUtils; 
import com.android.settingslib.Utils;

import com.android.settingslib.utils.ThreadUtils;

import com.android.settingslib.wifi.AccessPoint;

import com.android.wifi.flags.Flags;

import com.android.wifitrackerlib.WifiEntry;



import java.net.Inet4Address;

import java.net.InetAddress;
@@ -273,6 +276,12 @@ public class WifiConfigController implements TextWatcher, 
        mDoNotProvideEapUserCertString =

            mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);



        if (Flags.wepUsage() && mAccessPointSecurity == WifiEntry.SECURITY_WEP) {

            LinearLayout wepWarningLayout =

                    (LinearLayout) mView.findViewById(R.id.wep_warning_layout);

            wepWarningLayout.setVisibility(View.VISIBLE);

        }



        mSsidScanButton = (ImageButton) mView.findViewById(R.id.ssid_scanner_button);

        mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);

        mIpSettingsSpinner.setOnItemSelectedListener(this);

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

+8 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ import android.widget.CompoundButton; 
import android.widget.CompoundButton.OnCheckedChangeListener;

import android.widget.EditText;

import android.widget.ImageButton;

import android.widget.LinearLayout;

import android.widget.Spinner;

import android.widget.TextView;
@@ -77,6 +78,7 @@ import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2; 
import com.android.settings.wifi.dpp.WifiDppUtils;

import com.android.settingslib.Utils;

import com.android.settingslib.utils.ThreadUtils;

import com.android.wifi.flags.Flags;

import com.android.wifitrackerlib.WifiEntry;

import com.android.wifitrackerlib.WifiEntry.ConnectedInfo;
@@ -287,6 +289,12 @@ public class WifiConfigController2 implements TextWatcher, 
            mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);

        mInstallCertsString = mContext.getString(R.string.wifi_install_credentials);



        if (Flags.wepUsage() && mWifiEntrySecurity == WifiEntry.SECURITY_WEP) {

            LinearLayout wepWarningLayout =

                    (LinearLayout) mView.findViewById(R.id.wep_warning_layout);

            wepWarningLayout.setVisibility(View.VISIBLE);

        }



        mSsidScanButton = (ImageButton) mView.findViewById(R.id.ssid_scanner_button);

        mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);

        mIpSettingsSpinner.setOnItemSelectedListener(this);