From 26e35dac79ce0e9ce38a1bd5aadaae505e4103ce Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Wed, 7 Feb 2018 13:57:57 -0800
Subject: [PATCH] Delete WPS settings.

Removes the WPS PIN and Push button settings, all of
the strings, and related code.

Change-Id: I1c7a35ffc8491c57e07accba9b1b5f5407b01831
Fixes: 72421239
Test: deletes code, robotests
---
 res/drawable-hdpi/ic_wps_dark.png             | Bin 1897 -> 0 bytes
 res/drawable-hdpi/ic_wps_light.png            | Bin 1881 -> 0 bytes
 res/drawable-mdpi/ic_wps_dark.png             | Bin 1309 -> 0 bytes
 res/drawable-mdpi/ic_wps_light.png            | Bin 1274 -> 0 bytes
 res/drawable-xhdpi/ic_wps_dark.png            | Bin 2590 -> 0 bytes
 res/drawable-xhdpi/ic_wps_light.png           | Bin 2560 -> 0 bytes
 res/drawable-xxhdpi/ic_wps_dark.png           | Bin 2827 -> 0 bytes
 res/drawable-xxhdpi/ic_wps_light.png          | Bin 2854 -> 0 bytes
 res/layout/wifi_wps_dialog.xml                |  66 ----
 res/values/strings.xml                        |  30 --
 res/values/themes.xml                         |   8 -
 res/xml/wifi_configure_settings.xml           |   8 -
 .../settings/wifi/ConfigureWifiSettings.java  |   2 -
 .../android/settings/wifi/WifiSettings.java   |  30 --
 src/com/android/settings/wifi/WpsDialog.java  | 297 ------------------
 .../wifi/WpsPreferenceController.java         | 155 ---------
 .../wifi/WpsPreferenceControllerTest.java     | 140 ---------
 17 files changed, 736 deletions(-)
 delete mode 100644 res/drawable-hdpi/ic_wps_dark.png
 delete mode 100644 res/drawable-hdpi/ic_wps_light.png
 delete mode 100644 res/drawable-mdpi/ic_wps_dark.png
 delete mode 100644 res/drawable-mdpi/ic_wps_light.png
 delete mode 100644 res/drawable-xhdpi/ic_wps_dark.png
 delete mode 100644 res/drawable-xhdpi/ic_wps_light.png
 delete mode 100644 res/drawable-xxhdpi/ic_wps_dark.png
 delete mode 100644 res/drawable-xxhdpi/ic_wps_light.png
 delete mode 100644 res/layout/wifi_wps_dialog.xml
 delete mode 100644 src/com/android/settings/wifi/WpsDialog.java
 delete mode 100644 src/com/android/settings/wifi/WpsPreferenceController.java
 delete mode 100644 tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java

diff --git a/res/drawable-hdpi/ic_wps_dark.png b/res/drawable-hdpi/ic_wps_dark.png
deleted file mode 100644
index 918b0cc48bc4ed3319775d9be6b338cbb44e3fcc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1897
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
a6hiPI1mTl!j1W#N4{)$^v2DE&nDK8QyEu6O

diff --git a/res/drawable-hdpi/ic_wps_light.png b/res/drawable-hdpi/ic_wps_light.png
deleted file mode 100644
index 5ad9f3eaeaf4dfc6e741cd5ecb1c4f7403c00ecc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1881
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
Tami&o00000NkvXXu0mjfIi@LS

diff --git a/res/drawable-mdpi/ic_wps_dark.png b/res/drawable-mdpi/ic_wps_dark.png
deleted file mode 100644
index 77d73a808cda8d3169ead319c82868f595ff05e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1309
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UV>C6dj$D1FjT2AFf_C<F#G}vHN0S8C^cYUc$L7wU^Rn*LA+qju0R{01Y44~
zy9>jA5L~c#`DCC7XMsm#F_88EW4Dvpb_@*6Z#`WcLn01eoqoSNG*slc{qH+7FD{%T
zsJpQ#;Yy8$ypL<5$)@-V4*Y@qb|RdQ><u&;l|1}^E#U9G^rCse0#(~kXIl~1B>s#1
zS_^fi1RQC1n-y<qKWAt8*A3TqrJvpRTt@$gK(57|-QRCkuYLb(oqV<IkAC+Z@r+83
zmd~85>9BaEhREtHX@^FoJxo(oPi|b`uQ_2GgT+(Fsn;j#&eW1**v7P<(f(!r;l25c
zft(8tWL<n-_#iVOf|Yv%rv<OhwXKm4+#gtcaF*;?<NMUq_6|1>lRQ)MsTN7Y6~FVC
zA0LQK;4WaRxNNvFp=8U-J$yFIZ<x&(+8ft5`X%taV86y(-k?`r7Ia?zO0Brhybb{;
zjr0Q-<JilX-ZQRl$ZrU43$33Yo_tAR&C6RXAIv^XId$4A_Q4wS`EQx{82-QbBV(}i
z(DSRTudf_hG=po`dg&Xhvv~y_U7{E@jDq*c-eCT-mT4X1eAR3EtYKjc25QF|&mK6v
z?b;(I*VM}0E}5%e?~(q&G$X9htm>rl{;V%6&Rn<Qc6H3CtCx*fe65_p_`uR5RbOJC
zUDLf~E4}DUtje;KU^hVq@3o9cTC7Q1{<Hph$Tz!bci%s~go&F{dL$M*9|(<Mn6-7~
zSBBM{g7%LY?kFvr%4i_wc6EZ>-OrYWvcA{$?0ao2E7stuXOOY_O8jH1^((b`QVuiD
zV7kYe$8>+?*Yw6-t|RAkj6ck4Jmkb;Gv|ka##yy9_pW}moNr*^7`Ll;<2ohRR0c8i
zV*Le<*+;HVs+={+@$OBdQ(6yWigx(<n0GjClfCiqn}l#$;qu@4&)vBsJzniwDCg^N
zPU!I?2}9FxVg0#@i{`HtH%OZ{DSfi&LVMZSJ3k08eY0RR?>P8Wx}UvqdV~AP+C7ID
z%|F;4P(JcPJoSxM!QGQusSgYv+5VT|ULUo%vT2Xz%ap_fNp61ze!<txNBgGc?*=CA
zlMl-q#5;f5&E0YO#TF%#^<F{WzY3rJCh~z{V?}L9O6_IVzE}O7+wWOiRSs?t(_S>K
zRB-(>$-9>sWkP30ayVX^XAmqdvB|$7zC$oxKTz+<)WS22Ocjg~tFP&+i>+AyrB=DH
z{G0=a;|cwR%3kZYCZ;mzS?@Qya?8Br-s&R1M^y(GU9)LU6HeNG<NE={B$Mqdyp^GU
zE}ay3pqu(YY@@x*DuYFqRy>hRkC;RE#5ej(dj3=BLHdK}yVmSB+;7<YR$NtH`DqjX
z<T>Hx&Yd2<_47q0Dhlq@QQF^qV!cw4tIM{?&q_)&JN9TP)t-zB&b!K?*>S`+?I7C&
z(WJh5u08%Ar%(7_wqyHMkuL?J^2#qQSKhkb_sNMt)M3r$m4B}NzTaEV=up&YzrBi^
z16Ts6mbgZgq$HN4S|t~y0x1R~14Cn70}EXv^AJNbD^p7=BO_e{b1MS_-=CkeQ8eV{
zr(~v8qHD0QGBSf`P}gJu6-|;L8-nxGO3D+9QW+dm@{>{(JaZG%Q-e|yQz{Ejrh<wo
N22WQ%mvv4FO#t969j*WX

diff --git a/res/drawable-mdpi/ic_wps_light.png b/res/drawable-mdpi/ic_wps_light.png
deleted file mode 100644
index ef560fa5c3958e45e4b57ad672fb3740c0451057..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1274
zcmV<W1O@wvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L002k;002k;M#*bF000BZ
zNkl<ZSi{xV%Zpq^6bA6$bk8JCCgKw`*DN)P2J>h%t|Ee>f*=S%1vl=+rJySp{tIs0
zyNDQt(WRn`_=s>()P>O~DkhC+@R3Y(W-`+*>QuU>`cB7?g;;R8kE%N7JKy>0R9*h#
zHgmZK27^KQ+N-+P^F!OVmk*$DmgkKsTcc{qOkA4+`Bwlc#~Tb*&JW-Y{D>2AU$4QH
zAf^K7pm!A44Y&m#g@X}p#dFvi@5}fGZ{q8iKfy%r5}dDN0f+D+&S0$w;t=}y17~p_
zx8r#{5c4Pe^)JEsop=WKViE6QHbCsgBls(9=2Wf3+`I5QzROHDO=CD5n!QN+v-5}W
zco_c@Z%2R5>%L8b$!S}{69M3R%(QJg>SUmZK0ALHPlb_LydH-7MG79pRaHuI%c8vk
zH{vKXO`~a=$()2Zvh%$W`5A1%DSQ$`v!J%)y2$x7CYNv<?#|!Zw%wS5h(06U7PPI$
zwH2+T?o2I7m~-(yZB;E`9tR_c(O@v>)IeUd2eA`>2Hh+8qGNpDSlxM<*36D@44>n8
z@vRd;E*uB28qc$mihn96M_Ud0=VIIz{9TO60WIRBB)|)kYXEt0gB=ld9``HG6#z2b
zXM=@p;ouZ*4!YMRVJ?KdljscwgSCqR*bxSo;(JdLVt&rmPegkJzu+rLBQIcA^kutO
zX7JM($n6>%1vL|q<ma5@EYNp~J^{SmoaVY5Z3dtoJSxVHOm0TKYV3KFD`G`Q+iWkW
z*L2<oGU&ayuj((;GFwHzE{S-OfvWD8!YV<oO1gMf66j6Rrt`5>|1;g$>Gp!9zLb(-
z!O$2$DTu*fkUM`iE;u=Yc?<%~xo~=Q08oI~hHH&AGlw6-<|KfMf$OCuw68Frn3x^s
z+E8jJ1K1hBR*kiDtYCA4ergdujr|eTa!1N~g|ju?^?$c<F`Ac(*U_%%i4CDJ{6RQh
zvU$rzXxX?n<TT9%dn;kHhr<D;*S77bJ`?sL1(}u)rLA_s<Wj4dJ8dl1EZ+T*f@P`j
z9KmOq`YPRH2C6OiaL`-scr^pF_%`1AF|UvN<Gz5`@K#~B^Jw1V!Zw`GY{&7cq~;0H
zM6~DeX%+p0(keNPm!-|8YyO7Thv9IjX__2eFVgTE_DCn0tmrjKSSRp?@!4Syo|H=R
zE5T0ZDYz?_b<0e=FP+~WlaxJIq-L>VWIJAxicQ`tF6z9bPmzkUFKb{I?vVs`4Dagx
z6Dt25raJBf&;eqD!A-!Gb~^ulE(yRCAlbpxf4%=*`v<uoL0r^3`0M}x03~!qSaf7z
zbY(hYa%Ew3WdJfTF*7YNI4v?aR53O>H90ymGA%GSIxsLz`SWW4001R)MObuXVRU6W
zZEs|0W_bWIFflVNFgPtTH&ih;IyE*rFgPtRH##sdEBZ)j0000PbVXQnQ*UN;cVTj6
k06}DLVr3vnZDD6+Qe|Oed2z{QJOBUy07*qoM6N<$f)5otw*UYD

diff --git a/res/drawable-xhdpi/ic_wps_dark.png b/res/drawable-xhdpi/ic_wps_dark.png
deleted file mode 100644
index 3ea4a3b6bcb8574c28cafd39445da0cfe116922f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2590
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

diff --git a/res/drawable-xhdpi/ic_wps_light.png b/res/drawable-xhdpi/ic_wps_light.png
deleted file mode 100644
index f913d2c00eadb71903152589af636c7fc389e729..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2560
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
SQ+|D70KwYc>V<_{;(r0<6O*(6

diff --git a/res/drawable-xxhdpi/ic_wps_dark.png b/res/drawable-xxhdpi/ic_wps_dark.png
deleted file mode 100644
index 8b38db86f79148d4229ca4a8ffd1ae32b8bbd557..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2827
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
HZsUId+Si0;

diff --git a/res/drawable-xxhdpi/ic_wps_light.png b/res/drawable-xxhdpi/ic_wps_light.png
deleted file mode 100644
index 00841755b7669b50bd6c0405a0f0f1b2b240b7dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2854
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

diff --git a/res/layout/wifi_wps_dialog.xml b/res/layout/wifi_wps_dialog.xml
deleted file mode 100644
index a86823d66fa..00000000000
--- a/res/layout/wifi_wps_dialog.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-         android:layout_width="300sp"
-         android:layout_height="wrap_content">
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="8dip"
-            android:orientation="vertical">
-
-        <TextView
-                android:id="@+id/wps_dialog_txt"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dip" />
-
-        <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="8dip"
-                android:src="?attr/ic_wps" />
-
-        <ProgressBar
-                android:id="@+id/wps_timeout_bar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dip"
-                style="?android:attr/progressBarStyleHorizontal" />
-
-        <ProgressBar
-                android:id="@+id/wps_progress_bar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dip"
-                style="?android:attr/progressBarStyle" />
-
-        <RelativeLayout
-                android:gravity="center"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content">
-
-            <Button
-                    android:id="@+id/wps_dialog_btn"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/cancel" />
-        </RelativeLayout>
-    </LinearLayout>
-</ScrollView>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5fbbf4da961..e75bb245142 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1845,12 +1845,8 @@
     <string name="wifi_configure_settings_preference_summary_wakeup_off">Wi\u2011Fi doesn\u0027t turn back on automatically</string>
     <!-- Header for the list of wifi networks-->
     <string name="wifi_access_points">Wi\u2011Fi networks</string>
-    <!-- Menu option to do WPS Push Button [CHAR LIMIT=25]-->
-    <string name="wifi_menu_wps_pbc">WPS Push Button</string>
     <!-- Content description for menu button in Wifi setup. Not shown on the screen. [CHAR LIMIT=NONE] -->
     <string name="wifi_menu_more_options">More options</string>
-    <!-- Menu option to do WPS Pin Entry [CHAR LIMIT=25]-->
-    <string name="wifi_menu_wps_pin">WPS Pin Entry</string>
     <!-- Menu option to launch Wi-Fi Direct settings [CHAR LIMIT=20]-->
     <string name="wifi_menu_p2p">Wi\u2011Fi Direct</string>
     <!-- Menu option to scan Wi-Fi networks -->
@@ -1887,32 +1883,6 @@
     <string name="wifi_advanced_toggle_description_expanded">Drop down list Advanced Options. Double-tap to collapse.</string>
     <!-- Message for talkback to say when Advanced Options is collapsed [CHAR LIMIT=NONE] -->
     <string name="wifi_advanced_toggle_description_collapsed">Drop down list Advanced Options. Double-tap to expand.</string>
-    <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
-    <string name="wifi_wps_setup_title">Wi\u2011Fi Protected Setup</string>
-    <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
-    <string name="wifi_wps_setup_msg">Starting WPS\u2026</string>
-    <!-- Message in WPS dialog for PBC after start up [CHAR LIMIT=150] -->
-    <string name="wifi_wps_onstart_pbc">Press the Wi\u2011Fi Protected Setup button on your router. It may be called \u201cWPS\u201d or marked with this symbol:</string>
-    <!-- Message in WPS dialog for PIN after start up [CHAR LIMIT=150] -->
-    <string name="wifi_wps_onstart_pin">Enter pin <xliff:g id="number">%1$s</xliff:g> on your Wi\u2011Fi router. The setup can take up to two minutes to complete.</string>
-    <!-- Text displayed when WPS succeeds [CHAR LIMIT=150] -->
-    <string name="wifi_wps_complete">WPS succeeded. Connecting to the network\u2026</string>
-    <!-- Text displayed when Wi-Fi is connected through WPS [CHAR LIMIT=150] -->
-    <string name="wifi_wps_connected">Connected to Wi\u2011Fi network <xliff:g id="network_name">%s</xliff:g></string>
-    <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=150] -->
-    <string name="wifi_wps_in_progress">WPS is already in progress and can take up to two minutes to complete</string>
-    <!-- Text displayed when WPS fails to start [CHAR LIMIT=150] -->
-    <string name="wifi_wps_failed_generic">WPS failed. Please try again in a few minutes.</string>
-    <!-- Text displayed when WPS fails due to WEP [CHAR LIMIT=150] -->
-    <string name="wifi_wps_failed_wep">The wireless router security setting (WEP) is not supported</string>
-    <!-- Text displayed when WPS fails to TKIP [CHAR LIMIT=150] -->
-    <string name="wifi_wps_failed_tkip">The wireless router security setting (TKIP) is not supported</string>
-    <!-- Text displayed when WPS fails due to authentication issues [CHAR LIMIT=150] -->
-    <string name="wifi_wps_failed_auth">Authentication failure. Please try again.</string>
-    <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
-    <string name="wifi_wps_failed_overlap">Another WPS session was detected. Please try again in a few minutes.</string>
-    <!-- Text displayed when WPS fails due to wifi disconnected [CHAR LIMIT=150] -->
-    <string name="wifi_wps_failed_wifi_disconnected">Wi\u2011Fi disconnected. WPS setup canceled.</string>
     <!-- Label for the SSID of the network -->
     <string name="wifi_ssid">Network name</string>
     <!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] -->
diff --git a/res/values/themes.xml b/res/values/themes.xml
index e0f3989eb5c..d960654f11c 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -17,7 +17,6 @@
 <resources>
     <attr name="fingerprint_layout_theme" format="reference" />
     <attr name="ic_menu_moreoverflow" format="reference" />
-    <attr name="ic_wps" format="reference" />
     <attr name="side_margin" format="reference|dimension" />
     <attr name="wifi_signal_color" format="reference" />
 
@@ -28,7 +27,6 @@
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
-        <item name="ic_wps">@drawable/ic_wps_dark</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
@@ -47,7 +45,6 @@
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
-        <item name="ic_wps">@drawable/ic_wps_light</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
@@ -65,7 +62,6 @@
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
-        <item name="ic_wps">@drawable/ic_wps_dark</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
@@ -84,7 +80,6 @@
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
-        <item name="ic_wps">@drawable/ic_wps_light</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
@@ -102,7 +97,6 @@
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
-        <item name="ic_wps">@drawable/ic_wps_dark</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
@@ -121,7 +115,6 @@
         <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
-        <item name="ic_wps">@drawable/ic_wps_light</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
@@ -221,7 +214,6 @@
 
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
-        <item name="ic_wps">@drawable/ic_wps_light</item>
         <item name="wifi_signal">@drawable/wifi_signal</item>
         <item name="wifi_signal_color">?android:attr/colorAccent</item>
         <item name="wifi_friction">@drawable/wifi_friction</item>
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index 6993f265cf4..eae6faa059a 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -63,14 +63,6 @@
             android:title="@string/wifi_menu_p2p"
             android:fragment="com.android.settings.wifi.p2p.WifiP2pSettings"/>
 
-    <Preference
-            android:key="wps_push_button"
-            android:title="@string/wifi_menu_wps_pbc" />
-
-    <Preference
-            android:key="wps_pin_entry"
-            android:title="@string/wifi_menu_wps_pin" />
-
     <Preference
             android:key="mac_address"
             android:title="@string/wifi_advanced_mac_address_title"/>
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index b359bf35f0d..1607b74d464 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -92,8 +92,6 @@ public class ConfigureWifiSettings extends DashboardFragment {
         controllers.add(new WifiInfoPreferenceController(context, getLifecycle(), wifiManager));
         controllers.add(new CellularFallbackPreferenceController(context));
         controllers.add(new WifiP2pPreferenceController(context, getLifecycle(), wifiManager));
-        controllers.add(new WpsPreferenceController(
-                context, getLifecycle(), wifiManager, getFragmentManager()));
         return controllers;
     }
 
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 22f8c43f237..8e2ea636df4 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -85,16 +85,12 @@ public class WifiSettings extends RestrictedSettingsFragment
 
     private static final String TAG = "WifiSettings";
 
-    /* package */ static final int MENU_ID_WPS_PBC = Menu.FIRST;
-    private static final int MENU_ID_WPS_PIN = Menu.FIRST + 1;
     private static final int MENU_ID_CONNECT = Menu.FIRST + 6;
     private static final int MENU_ID_FORGET = Menu.FIRST + 7;
     private static final int MENU_ID_MODIFY = Menu.FIRST + 8;
     private static final int MENU_ID_WRITE_NFC = Menu.FIRST + 9;
 
     public static final int WIFI_DIALOG_ID = 1;
-    /* package */ static final int WPS_PBC_DIALOG_ID = 2;
-    private static final int WPS_PIN_DIALOG_ID = 3;
     private static final int WRITE_NFC_DIALOG_ID = 6;
 
     // Instance state keys
@@ -459,24 +455,6 @@ public class WifiSettings extends RestrictedSettingsFragment
         }
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // If the user is not allowed to configure wifi, do not handle menu selections.
-        if (mIsRestricted) {
-            return false;
-        }
-
-        switch (item.getItemId()) {
-            case MENU_ID_WPS_PBC:
-                showDialog(WPS_PBC_DIALOG_ID);
-                return true;
-            case MENU_ID_WPS_PIN:
-                showDialog(WPS_PIN_DIALOG_ID);
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
     @Override
     public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
             Preference preference = (Preference) view.getTag();
@@ -635,10 +613,6 @@ public class WifiSettings extends RestrictedSettingsFragment
 
                 mSelectedAccessPoint = mDlgAccessPoint;
                 return mDialog;
-            case WPS_PBC_DIALOG_ID:
-                return new WpsDialog(getActivity(), WpsInfo.PBC);
-            case WPS_PIN_DIALOG_ID:
-                return new WpsDialog(getActivity(), WpsInfo.DISPLAY);
             case WRITE_NFC_DIALOG_ID:
                 if (mSelectedAccessPoint != null) {
                     mWifiToNfcDialog = new WriteWifiConfigToNfcDialog(
@@ -660,10 +634,6 @@ public class WifiSettings extends RestrictedSettingsFragment
         switch (dialogId) {
             case WIFI_DIALOG_ID:
                 return MetricsEvent.DIALOG_WIFI_AP_EDIT;
-            case WPS_PBC_DIALOG_ID:
-                return MetricsEvent.DIALOG_WIFI_PBC;
-            case WPS_PIN_DIALOG_ID:
-                return MetricsEvent.DIALOG_WIFI_PIN;
             case WRITE_NFC_DIALOG_ID:
                 return MetricsEvent.DIALOG_WIFI_WRITE_NFC;
             default:
diff --git a/src/com/android/settings/wifi/WpsDialog.java b/src/com/android/settings/wifi/WpsDialog.java
deleted file mode 100644
index 440b72d9e05..00000000000
--- a/src/com/android/settings/wifi/WpsDialog.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi;
-
-import android.app.AlertDialog;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.NetworkInfo;
-import android.net.NetworkInfo.DetailedState;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WpsInfo;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.android.settings.R;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-
-/**
- * Dialog to show WPS progress.
- */
-public class WpsDialog extends AlertDialog {
-
-    private final static String TAG = "WpsDialog";
-    private static final String DIALOG_STATE = "android:dialogState";
-    private static final String DIALOG_MSG_STRING = "android:dialogMsg";
-
-    private View mView;
-    private TextView mTextView;
-    private ProgressBar mTimeoutBar;
-    private ProgressBar mProgressBar;
-    private Button mButton;
-    private Timer mTimer;
-
-    private static final int WPS_TIMEOUT_S = 120;
-
-    private WifiManager mWifiManager;
-    private WifiManager.WpsCallback mWpsListener;
-    private int mWpsSetup;
-
-    private final IntentFilter mFilter;
-    private BroadcastReceiver mReceiver;
-
-    private Context mContext;
-    private Handler mHandler = new Handler();
-    private String mMsgString = "";
-
-    private enum DialogState {
-        WPS_INIT,
-        WPS_START,
-        WPS_COMPLETE,
-        CONNECTED, //WPS + IP config is done
-        WPS_FAILED
-    }
-    DialogState mDialogState = DialogState.WPS_INIT;
-
-    public WpsDialog(Context context, int wpsSetup) {
-        super(context);
-        mContext = context;
-        mWpsSetup = wpsSetup;
-
-        class WpsListener extends WifiManager.WpsCallback {
-
-            public void onStarted(String pin) {
-                if (pin != null) {
-                    updateDialog(DialogState.WPS_START, String.format(
-                            mContext.getString(R.string.wifi_wps_onstart_pin), pin));
-                } else {
-                    updateDialog(DialogState.WPS_START, mContext.getString(
-                            R.string.wifi_wps_onstart_pbc));
-                }
-            }
-
-            public void onSucceeded() {
-                updateDialog(DialogState.WPS_COMPLETE,
-                        mContext.getString(R.string.wifi_wps_complete));
-            }
-
-            public void onFailed(int reason) {
-                String msg;
-                switch (reason) {
-                    case WifiManager.WPS_OVERLAP_ERROR:
-                        msg = mContext.getString(R.string.wifi_wps_failed_overlap);
-                        break;
-                    case WifiManager.WPS_WEP_PROHIBITED:
-                        msg = mContext.getString(R.string.wifi_wps_failed_wep);
-                        break;
-                    case WifiManager.WPS_TKIP_ONLY_PROHIBITED:
-                        msg = mContext.getString(R.string.wifi_wps_failed_tkip);
-                        break;
-                    case WifiManager.IN_PROGRESS:
-                        msg = mContext.getString(R.string.wifi_wps_in_progress);
-                        break;
-                    default:
-                        msg = mContext.getString(R.string.wifi_wps_failed_generic);
-                        break;
-                }
-                updateDialog(DialogState.WPS_FAILED, msg);
-            }
-        }
-
-        mWpsListener = new WpsListener();
-
-
-        mFilter = new IntentFilter();
-        mFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
-        mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
-        mReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                handleEvent(context, intent);
-            }
-        };
-        setCanceledOnTouchOutside(false);
-    }
-
-    @Override
-    public Bundle onSaveInstanceState () {
-        Bundle bundle  = super.onSaveInstanceState();
-        bundle.putString(DIALOG_STATE, mDialogState.toString());
-        bundle.putString(DIALOG_MSG_STRING, mMsgString.toString());
-        return bundle;
-    }
-
-    @Override
-    public void onRestoreInstanceState(Bundle savedInstanceState) {
-        if (savedInstanceState != null) {
-            super.onRestoreInstanceState(savedInstanceState);
-            DialogState dialogState = mDialogState.valueOf(savedInstanceState.getString(DIALOG_STATE));
-            String msg = savedInstanceState.getString(DIALOG_MSG_STRING);
-            updateDialog(dialogState, msg);
-            if (dialogState == DialogState.WPS_START) {
-                startWps();
-            }
-        }
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        mView = getLayoutInflater().inflate(R.layout.wifi_wps_dialog, null);
-
-        mTextView = (TextView) mView.findViewById(R.id.wps_dialog_txt);
-        mTextView.setText(R.string.wifi_wps_setup_msg);
-
-        mTimeoutBar = ((ProgressBar) mView.findViewById(R.id.wps_timeout_bar));
-        mTimeoutBar.setMax(WPS_TIMEOUT_S);
-        mTimeoutBar.setProgress(0);
-
-        mProgressBar = ((ProgressBar) mView.findViewById(R.id.wps_progress_bar));
-        mProgressBar.setVisibility(View.GONE);
-
-        mButton = ((Button) mView.findViewById(R.id.wps_dialog_btn));
-        mButton.setText(R.string.wifi_cancel);
-        mButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                dismiss();
-            }
-        });
-
-        mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
-
-        setView(mView);
-        if (savedInstanceState == null) {
-            startWps();
-        }
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    protected void onStart() {
-        /*
-         * increment timeout bar per second.
-         */
-        mTimer = new Timer(false);
-        mTimer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                mHandler.post(new Runnable() {
-
-                    @Override
-                    public void run() {
-                        mTimeoutBar.incrementProgressBy(1);
-                    }
-                });
-            }
-        }, 1000, 1000);
-
-        mContext.registerReceiver(mReceiver, mFilter);
-
-    }
-
-    @Override
-    protected void onStop() {
-        if (mDialogState != DialogState.WPS_COMPLETE) {
-            mWifiManager.cancelWps(null);
-        }
-
-        if (mReceiver != null) {
-            mContext.unregisterReceiver(mReceiver);
-            mReceiver = null;
-        }
-
-        if (mTimer != null) {
-            mTimer.cancel();
-        }
-    }
-
-    private void updateDialog(final DialogState state, final String msg) {
-        if (mDialogState.ordinal() >= state.ordinal()) {
-            //ignore.
-            return;
-        }
-        mDialogState = state;
-        mMsgString = msg;
-
-        mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    switch(state) {
-                        case WPS_COMPLETE:
-                            mTimeoutBar.setVisibility(View.GONE);
-                            mProgressBar.setVisibility(View.VISIBLE);
-                            break;
-                        case CONNECTED:
-                        case WPS_FAILED:
-                            mButton.setText(mContext.getString(R.string.dlg_ok));
-                            mTimeoutBar.setVisibility(View.GONE);
-                            mProgressBar.setVisibility(View.GONE);
-                            if (mReceiver != null) {
-                                mContext.unregisterReceiver(mReceiver);
-                                mReceiver = null;
-                            }
-                            break;
-                    }
-                    mTextView.setText(msg);
-                }
-            });
-   }
-
-    private void handleEvent(Context context, Intent intent) {
-        String action = intent.getAction();
-        if (WifiManager.WIFI_STATE_CHANGED_ACTION.equals(action)) {
-            final int state = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
-                    WifiManager.WIFI_STATE_UNKNOWN);
-            if (state == WifiManager.WIFI_STATE_DISABLED) {
-                if (mTimer != null) {
-                    mTimer.cancel();
-                    mTimer = null;
-                }
-                String msg = mContext.getString(R.string.wifi_wps_failed_wifi_disconnected);
-                updateDialog(DialogState.WPS_FAILED, msg);
-            }
-        } else if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(action)) {
-            NetworkInfo info = (NetworkInfo) intent.getParcelableExtra(
-                    WifiManager.EXTRA_NETWORK_INFO);
-            final NetworkInfo.DetailedState state = info.getDetailedState();
-            if (state == DetailedState.CONNECTED &&
-                    mDialogState == DialogState.WPS_COMPLETE) {
-                WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
-                if (wifiInfo != null) {
-                    String msg = String.format(mContext.getString(
-                            R.string.wifi_wps_connected), wifiInfo.getSSID());
-                    updateDialog(DialogState.CONNECTED, msg);
-                }
-            }
-        }
-    }
-
-    private void startWps() {
-        WpsInfo wpsConfig = new WpsInfo();
-        wpsConfig.setup = mWpsSetup;
-        mWifiManager.startWps(wpsConfig, mWpsListener);
-    }
-}
diff --git a/src/com/android/settings/wifi/WpsPreferenceController.java b/src/com/android/settings/wifi/WpsPreferenceController.java
deleted file mode 100644
index f6365936707..00000000000
--- a/src/com/android/settings/wifi/WpsPreferenceController.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi;
-
-import android.app.Dialog;
-import android.app.FragmentManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WpsInfo;
-import android.os.Bundle;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
-import com.android.settingslib.core.lifecycle.events.OnResume;
-
-/**
- * {@link PreferenceControllerMixin} that shows Dialog for WPS progress. Disabled when Wi-Fi is off.
- */
-public class WpsPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin, LifecycleObserver, OnPause, OnResume {
-
-    private static final String KEY_WPS_PUSH = "wps_push_button";
-    private static final String KEY_WPS_PIN = "wps_pin_entry";
-
-    private final WifiManager mWifiManager;
-    private final FragmentManager mFragmentManager;
-    @VisibleForTesting
-    final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            togglePreferences();
-        }
-    };
-    private final IntentFilter mFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
-
-    private Preference mWpsPushPref;
-    private Preference mWpsPinPref;
-
-    public WpsPreferenceController(
-            Context context,
-            Lifecycle lifecycle,
-            WifiManager wifiManager,
-            FragmentManager fragmentManager) {
-        super(context);
-        mWifiManager = wifiManager;
-        mFragmentManager = fragmentManager;
-        lifecycle.addObserver(this);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        // Always show preference.
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        // Returns null because this controller contains more than 1 preference.
-        return null;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mWpsPushPref = screen.findPreference(KEY_WPS_PUSH);
-        mWpsPinPref = screen.findPreference(KEY_WPS_PIN);
-        if (mWpsPushPref == null || mWpsPinPref == null) {
-            return;
-        }
-        // WpsDialog: Create the dialog like WifiSettings does.
-        mWpsPushPref.setOnPreferenceClickListener((arg) -> {
-                    WpsFragment wpsFragment = new WpsFragment(WpsInfo.PBC);
-                    wpsFragment.show(mFragmentManager, KEY_WPS_PUSH);
-                    return true;
-                }
-        );
-
-        // WpsDialog: Create the dialog like WifiSettings does.
-        mWpsPinPref.setOnPreferenceClickListener((arg) -> {
-            WpsFragment wpsFragment = new WpsFragment(WpsInfo.DISPLAY);
-            wpsFragment.show(mFragmentManager, KEY_WPS_PIN);
-            return true;
-        });
-        togglePreferences();
-    }
-
-    @Override
-    public void onResume() {
-        mContext.registerReceiver(mReceiver, mFilter);
-    }
-
-    @Override
-    public void onPause() {
-        mContext.unregisterReceiver(mReceiver);
-    }
-
-    private void togglePreferences() {
-        if (mWpsPushPref != null && mWpsPinPref != null) {
-            boolean enabled = mWifiManager.isWifiEnabled();
-            mWpsPushPref.setEnabled(enabled);
-            mWpsPinPref.setEnabled(enabled);
-        }
-    }
-
-    /**
-     * Fragment for Dialog to show WPS progress.
-     */
-    public static class WpsFragment extends InstrumentedDialogFragment {
-        private static int mWpsSetup;
-
-        // Public default constructor is required for rotation.
-        public WpsFragment() {
-            super();
-        }
-
-        public WpsFragment(int wpsSetup) {
-            super();
-            mWpsSetup = wpsSetup;
-        }
-
-        @Override
-        public int getMetricsCategory() {
-            return MetricsEvent.DIALOG_WPS_SETUP;
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            return new WpsDialog(getActivity(), mWpsSetup);
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
deleted file mode 100644
index e4dfea4f3eb..00000000000
--- a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi;
-
-import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
-import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.FragmentManager;
-import android.arch.lifecycle.LifecycleOwner;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.wifi.WifiManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WpsPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private WifiManager mWifiManager;
-    @Mock
-    private FragmentManager mFragmentManager;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private Preference mWpsPushPref;
-    @Mock
-    private Preference mWpsPinPref;
-
-    private Lifecycle mLifecycle;
-    private LifecycleOwner mLifecycleOwner;
-    private WpsPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mLifecycleOwner = () -> mLifecycle;
-        mLifecycle = new Lifecycle(mLifecycleOwner);
-        when(mContext.getSystemService(WifiManager.class))
-                .thenReturn(mWifiManager);
-        when(mScreen.findPreference(anyString()))
-                .thenReturn(mWpsPushPref)
-                .thenReturn(mWpsPinPref);
-        mController = new WpsPreferenceController(
-                mContext, mLifecycle, mWifiManager, mFragmentManager);
-    }
-
-    @Test
-    public void testIsAvailable_shouldAlwaysReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void testOnResume_shouldRegisterListener() {
-        mLifecycle.handleLifecycleEvent(ON_RESUME);
-        verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
-    }
-    @Test
-    public void testOnPause_shouldUnregisterListener() {
-        mLifecycle.handleLifecycleEvent(ON_RESUME);
-        mLifecycle.handleLifecycleEvent(ON_PAUSE);
-        verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
-    }
-
-    @Test
-    public void testWifiStateChange_shouldToggleEnabledState() {
-        when(mWifiManager.isWifiEnabled()).thenReturn(true);
-
-        //Sets the preferences.
-        mController.displayPreference(mScreen);
-        verify(mWpsPushPref).setEnabled(true);
-        verify(mWpsPinPref).setEnabled(true);
-
-        Intent dummyIntent = new Intent();
-        mController.mReceiver.onReceive(mContext, dummyIntent);
-        verify(mWpsPushPref, times(2)).setEnabled(true);
-        verify(mWpsPinPref, times(2)).setEnabled(true);
-
-        when(mWifiManager.isWifiEnabled()).thenReturn(false);
-        mController.mReceiver.onReceive(mContext, dummyIntent);
-        verify(mWpsPushPref).setEnabled(false);
-        verify(mWpsPinPref).setEnabled(false);
-    }
-
-    @Test
-    public void testDisplayPreference_shouldSetPreferenceClickListenerAndToggleEnabledState() {
-        when(mWifiManager.isWifiEnabled()).thenReturn(true);
-        mController.displayPreference(mScreen);
-        verify(mWpsPushPref).setOnPreferenceClickListener(any());
-        verify(mWpsPinPref).setOnPreferenceClickListener(any());
-        verify(mWpsPushPref).setEnabled(true);
-        verify(mWpsPinPref).setEnabled(true);
-    }
-
-    @Test
-    public void testDisplayPreference_shouldDisablePreferenceWhenWifiDisabled() {
-        when(mWifiManager.isWifiEnabled()).thenReturn(false);
-        mController.displayPreference(mScreen);
-        verify(mWpsPushPref).setEnabled(false);
-        verify(mWpsPinPref).setEnabled(false);
-    }
-}