1 files changed, 20 insertions, 2 deletions
diff --git a/src/com/android/settings/profiles/ProfileConfig.java b/src/com/android/settings/profiles/ProfileConfig.java
index fc47ff03c..a27baa784 100644
--- a/src/com/android/settings/profiles/ProfileConfig.java
+++ b/src/com/android/settings/profiles/ProfileConfig.java
@@ -35,7 +35,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.media.AudioManager;
 import android.net.wimax.WimaxHelper;
-import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -64,6 +63,8 @@ public class ProfileConfig extends SettingsPreferenceFragment
 
     private static final int MENU_DELETE = Menu.FIRST + 1;
 
+    private static final int MENU_WIFI = Menu.FIRST + 2;
+
     private Profile mProfile;
 
     private NamePreference mNamePreference;
@@ -128,12 +129,16 @@ public class ProfileConfig extends SettingsPreferenceFragment
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (NfcAdapter.getDefaultAdapter(getActivity()) != null) {
+        if (deviceSupportsNfc(getActivity())) {
             MenuItem nfc = menu.add(0, MENU_NFC_WRITE, 0, R.string.profile_write_nfc_tag)
                 .setIcon(R.drawable.ic_menu_nfc_writer_dark);
             nfc.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
                     MenuItem.SHOW_AS_ACTION_WITH_TEXT);
         }
+        MenuItem wifi = menu.add(0, MENU_WIFI, 0, R.string.profile_trigger_wifi)
+                .setIcon(R.drawable.ic_location);
+        wifi.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
+                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
         MenuItem delete = menu.add(0, MENU_DELETE, 1, R.string.profile_menu_delete)
                 .setIcon(R.drawable.ic_menu_trash_holo_dark);
         delete.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
@@ -149,6 +154,9 @@ public class ProfileConfig extends SettingsPreferenceFragment
             case MENU_NFC_WRITE:
                 startNFCProfileWriter();
                 return true;
+            case MENU_WIFI:
+                startWifiTrigger();
+                return true;
             default:
                 return false;
         }
@@ -178,6 +186,16 @@ public class ProfileConfig extends SettingsPreferenceFragment
         pa.startActivity(i);
     }
 
+    private void startWifiTrigger() {
+        final PreferenceActivity pa = (PreferenceActivity) getActivity();
+        final String title = getResources().getString(R.string.profile_trigger_title_wifi,
+                mProfile.getName());
+        final Bundle args = new Bundle();
+        args.putParcelable("profile", mProfile);
+
+        pa.startPreferencePanel(WifiTriggerFragment.class.getName(), args, 0, title, null, 0);
+    }
+
     private void fillList() {
         PreferenceScreen prefSet = getPreferenceScreen();