commit 1cbacf10bd525c8f467b37abc57085b071abd6de
author Daisuke Miyakawa <dmiyakawa@google.com> Wed May 16 10:11:38 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 16 10:11:38 2012 -0700
tree aff63ae037bac140f0f7c6147a7a17bc407fe3c7
parent e99006f75b2639dbe910a318516f13b13af47480
parent dba00b6097f04a4923169bd891a5d70c729b5d86

Merge "Hide "Call ringtone & vibrate" when with no phone capability" into jb-dev

res/drawable-hdpi/ic_wps.png

diff --git a/res/drawable-hdpi/ic_wps.png b/res/drawable-hdpi/ic_wps.png
new file mode 100644
index 0000000..36c2a32
--- /dev/null
+++ b/res/drawable-hdpi/ic_wps.png
Binary files differ

res/drawable-mdpi/ic_wps.png

diff --git a/res/drawable-mdpi/ic_wps.png b/res/drawable-mdpi/ic_wps.png
new file mode 100644
index 0000000..e522e97
--- /dev/null
+++ b/res/drawable-mdpi/ic_wps.png
Binary files differ

res/drawable-xhdpi/ic_wps.png

diff --git a/res/drawable-xhdpi/ic_wps.png b/res/drawable-xhdpi/ic_wps.png
new file mode 100644
index 0000000..71308f2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wps.png
Binary files differ

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

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 9fa1167..a7e6edf 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -344,6 +344,7 @@
         if (mSetupWizardMode) {
             // FIXME: add setIcon() when graphics are available
             menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
+                    .setIcon(R.drawable.ic_wps)
                     .setEnabled(wifiIsEnabled)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
             menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)