From 9d5a6eb4d7ec662e666dc5dfe1506616d5b59341 Mon Sep 17 00:00:00 2001 From: Michael Kolb Date: Wed, 23 May 2012 10:26:53 -0700 Subject: [PATCH] Match setup wizard wifi settings with new wireframes Bug: 6521472 Change-Id: I159d8a98327ad775b2c5ccfc7380d60d62b54dad --- res/drawable-hdpi/ic_menu_add.png | Bin 534 -> 667 bytes res/drawable-mdpi/ic_menu_add.png | Bin 476 -> 596 bytes res/drawable-xhdpi/ic_menu_add.png | Bin 610 -> 761 bytes res/layout/setup_preference.xml | 55 ++++++++++++++---- res/menu/wifi_setup.xml | 21 +++++++ res/values-sw600dp/dimens.xml | 1 + res/values/dimens.xml | 1 + res/values/strings.xml | 6 ++ .../android/settings/wifi/WifiSettings.java | 40 ++++++++----- 9 files changed, 99 insertions(+), 25 deletions(-) create mode 100644 res/menu/wifi_setup.xml diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png index 9f7d9820260a6868915b6af8ac0506aa3c92ea29..4b68f52ad0a4b413a98b6ab7e4e1a902b02385af 100644 GIT binary patch literal 667 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)pVryh>nTu$sZZAYL$MSD+10f-TA0 z-G$*l2rk&Wd@@jkv%n*=n1O*?2!t6g-L3lrG(N-A#W5t~-rJcQ{SF%lwAn9DJlR*l zyKIH?&58-@YMJF4*^^hykf>x$aCf*Y?EkT& zWg1G0BQqIaY<&>(MenrQQLYf4&9!_wTYj^W&c%a&(v z0yU8=9F7~S|DCq&NUGj5vnDw5hW>!C8<`) zMX5lF!N|bSNY}tr*U&t~(9Fuj!pZ>1HMcS_2;zJXiaCUa-29Zxv`X9>ltaSxff{5$ xHU#IVm6RtIr7}3C^c$_r?GK literal 534 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877l!}s{b%+Ad7K3vk;OpT z1B~5HX4`=T%L*LRfizez!?|}o;S3Cna-J@ZArXh)PIt^ZWFX)g|7L+#Xx|lC!P#*d z<_}zQ0&Wzlgsi;qqg=3k1=FR%)ms#P>hIZj{Jim|e>Wz4y|1-~oAtp52X_ySJ@a{F z8pY!pd8=ata|)OK)R^bs%e-gv@njYYV}}FMM*^=ISTA6xIitF8OW6Vbsf>~n80#52 z(!|#u^=I(*E4;?|v_+EDO5%CDhxqH5@+x{@dIQvZoV@Ba*)u@duWjQN%#4a*>H%(2q zManZsd5g!H0~Nl<`^+wz@;*gTe~DWM4f*#X5) diff --git a/res/drawable-mdpi/ic_menu_add.png b/res/drawable-mdpi/ic_menu_add.png index 254a572491872886b796f8bf122877c8c9141f0c..15ffadd3606f09de78cae03693ad50c2335a2e04 100644 GIT binary patch literal 596 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UV>C6dj$D1FjT2AFf_CjA5L~c#`DCC7XMsm#F#`j)5C}6~x?A@LXuP7Qi(^Q{;kVNRy^a_NwCyj{)_bFO z?{qo8vR!xk$55N2acO}Y9!;y4pH$Mm=ZP@s3{ zVo~U;1V)2uhFn3bHtDRTN0_f|WQ=IntQR^s(=eK$&#BsW2k(_qE{*9OtNMZ)ObhNZ zA8AnDP&zUH@gJ}K%MUccRoyo*$1Qp*SD`MGc}+0HvoPrU(kpk{GFg5w*hv;j>*ZQh3hFVau?PHey&|$s zpDBT*%J>`$9~nlofYW%-xOKF@$5s9NG0QIe8al4_M)lnSI6j0_Bo zbPY^(4b4Lg&8$o;tPFr$b1MUbAkO!oAV+A(%}>cptHiBAIV4;ks6hr~LvVgtNqJ&X oDuZK6ep0G}TV_#ed45rLv4V53Y2nt#Wzopr03f~8Gynhq delta 424 zcmcb@a))_>WIYQ51H;YYP4z&EDaqU2h2ejD|C#+j9%q3^WHFHT0Ash4*>)hovI56+ zAgut#?Z4*C1u~v^x;Tb-9KSo&lkboLkL!F-#}3w~GIu!qu8XeO!S_5tV5-ES^uUlS zB21yJT_4mYzO}h&AI20rdoS0DhHy${vQ90ju_Y^Ga?|@%lK2 zLEgKQndi9l->TfLznC3@&c$dCDJfZ@phE1-jYmypZVqxG&pjiJjz3(xw?iy9@sQMvO$*O=i^(ZHYh5jJQNY%S z<&8zcd)GIwq;|_ceaHAw+_NI1v$6VuGIa={(U8nZ*8dPjf0!G zC+}kvmon5fFw`|N3^6pZGBUI>G|@G%ure@U{LYg&`8}h!H+JcQRa@=?!%MQnHKHUq rKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkDP!WTttDnm{r-UW|Zl#`O diff --git a/res/drawable-xhdpi/ic_menu_add.png b/res/drawable-xhdpi/ic_menu_add.png index 6b1df2ffba6a261108df5f79bc2a5e44038fdc98..420510e935cf5ae4ecf824e681f44af9102a03e3 100644 GIT binary patch literal 761 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV z+ueoXKL{?^yL>WGgtNdSvY3H^TL^?1FWs&C12q1ar;B4q#jUrqefn9}k^$PT4nCSNroHqm8#cdHNn(oU1T& zy&%AJpk(=O6Y02fK8X%u+{%?$n5`wj-KW8CakGqbPrLW6yy^a8O3$9My{10J)jU|mtje1+-C4#q6TtUC-_ z8BFsUq8esh`~Ogp<&2J)0sF%Kh(f+x*6>ia9HHM;>Pv-;mukg5+he;t=ejbl1^Ygu zV+N~|vTvHcP*7}HIdiIFi}ZuWRe94lms~YbOqo~17{l~E?VHH+qKt%7Eold2ew@g0 zFn*fM_QWJ%-lFT}jV*?(ANbY?9bdlbH^&;IIO{CEU2JmE%#Xw_U03?S5p(6O`GaY4 zVh5{av+uG6zsvCa`sewQl-n0(Fy5c}xMWcjvs!2E-pjKX4O4$rq~873y?*`m$H&)M z|B5|;&wEnl4!RD#pS&+N-Jcbk{`TE|$%K&7-$(uKXYfQYm*>>$?GNJ!oF{Qp+<23) zasN!4Kg4bg7ec#$`gxH85~pclTsDj gGK*5n^NX^J6`X@j3%5Qt1FB>2boFyt=akR{00+z=&Hw-a literal 610 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_5;rX+877l!}s{b%+Ad7K3vk;OpT z1B~5HX4`=T%L*LRfwTh{zxwdR>EmT*S1+GAfc8tHLH-$+|W5$%{oTO_sd8#Z&HkoD`5~X`;uDNA2cU@UXTt(-)5-tdJ?8P4HbeO2ulH{lBqlD&u&g+BuJcgeq|+?c&OX2U zB(CdNJ%1azccv%*9W@TIuLp#ALxt+v6~sKZN^8lzjcojJSs>(020xcy^0bikPm^{h z|IZX#Bm4DZxATP@vA$#m=XREd+U5tOx4(4ED7jryQH!RohiGOt@r*mZUW z&%B`AZF@`@B79$ogrD*`oTWBXRnIN?+T`<0>;()^q+zKkI`Ue)(ptL>B~6NFNl*Sd)i+RE@A}Nw-2WFAw(Q*@?+6Tj)e_f;l9a@fRIB8o zR3OD*WMF8hYhbKvXcl5nU~Xk#pt-6=7ezyEeoAIqC2kE7-)$xWHAsSN t2+mI{DNig)WpGT%PfAtr%uP&B4N6T+sVqF1Y6Dcn;OXk;vd$@?2>?dL - - @@ -102,6 +92,47 @@ android:gravity="center" android:visibility="gone" /> + + + + + + + + + + + + + + + diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index e3c1bd28bb2..80d53689f94 100755 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -29,4 +29,5 @@ 10% 0dip 48dip + 32dip diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 49474fa9676..c397209581f 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -41,6 +41,7 @@ 0dip 25sp 32dip + 16dip 3dip 6dip diff --git a/res/values/strings.xml b/res/values/strings.xml index e1ca016fbf7..becfff306bb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1230,6 +1230,12 @@ To see available networks, turn Wi-Fi on. Searching for Wi-Fi networks\u2026 + + Other network\u2026 + + More + + Automatic setup (WPS) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index ac7f3212183..28b0f3620f3 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -59,6 +59,8 @@ import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.ImageButton; +import android.widget.PopupMenu; +import android.widget.PopupMenu.OnMenuItemClickListener; import android.widget.RelativeLayout; import android.widget.Switch; import android.widget.TextView; @@ -193,26 +195,38 @@ public class WifiSettings extends SettingsPreferenceFragment } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, + public View onCreateView(final LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { if (mSetupWizardMode) { View view = inflater.inflate(R.layout.setup_preference, container, false); - ImageButton b1 = (ImageButton) view.findViewById(R.id.wps_push); - if (b1 != null) { - b1.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - showDialog(WPS_PBC_DIALOG_ID); + View other = view.findViewById(R.id.other_network); + other.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + if (mWifiManager.isWifiEnabled()) { + onAddNetworkPressed(); } - }); - } - ImageButton b2 = (ImageButton) view.findViewById(R.id.add_network); - if (b2 != null) { - b2.setOnClickListener(new OnClickListener() { + } + }); + final ImageButton b = (ImageButton) view.findViewById(R.id.more); + if (b != null) { + b.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { if (mWifiManager.isWifiEnabled()) { - onAddNetworkPressed(); + PopupMenu pm = new PopupMenu(inflater.getContext(), b); + pm.inflate(R.menu.wifi_setup); + pm.setOnMenuItemClickListener(new OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + if (R.id.wifi_wps == item.getItemId()) { + showDialog(WPS_PBC_DIALOG_ID); + return true; + } + return false; + } + }); + pm.show(); } } });