From 4fee070366bd0f8cbea4308f4c765d62fa301400 Mon Sep 17 00:00:00 2001
From: Chong Zhang <chz@google.com>
Date: Thu, 29 Aug 2013 15:33:12 -0700
Subject: [PATCH] wifi-display: add drop down list for Wps config method

Bug: 9371882

Change-Id: I8c8c645bbb3db9f9d038f015f6aa6078ce3e56c3
---
 res/values/strings.xml                             |  2 ++
 .../android/settings/wfd/WifiDisplaySettings.java  | 37 +++++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5fb7fe2d3f..e2fb03afa7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1274,6 +1274,8 @@
     <string name="wifi_display_pause">Pause</string>
     <!-- Wifi Display settings. The button text for sending play (resume) trigger during certification process. [CHAR LIMIT=40] -->
     <string name="wifi_display_resume">Resume</string>
+    <!-- Wifi Display settings. The dropdown menu title for choosing WPS configuration during certification process. [CHAR LIMIT=40] -->
+    <string name="wifi_display_wps_config">WPS configuration</string>
     <!-- Wifi Display settings. The dropdown menu title for choosing listen channel during certification process. [CHAR LIMIT=40] -->
     <string name="wifi_display_listen_channel">Listen channel</string>
     <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index 7f560b3efe..6ec79f387e 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -33,6 +33,7 @@ import android.net.Uri;
 import android.net.wifi.p2p.WifiP2pManager;
 import android.net.wifi.p2p.WifiP2pManager.ActionListener;
 import android.net.wifi.p2p.WifiP2pManager.Channel;
+import android.net.wifi.WpsInfo;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -94,6 +95,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
     private PreferenceGroup mCertCategory;
     private boolean mListen;
     private boolean mAutoGO;
+    private int mWpsConfig = WpsInfo.INVALID;
     private int mListenChannel;
     private int mOperatingChannel;
 
@@ -160,6 +162,8 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
                 Settings.Global.WIFI_DISPLAY_ON), false, mSettingsObserver);
         getContentResolver().registerContentObserver(Settings.Global.getUriFor(
                 Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON), false, mSettingsObserver);
+        getContentResolver().registerContentObserver(Settings.Global.getUriFor(
+            Settings.Global.WIFI_DISPLAY_WPS_CONFIG), false, mSettingsObserver);
 
         mDisplayManager.scanWifiDisplays();
 
@@ -222,6 +226,8 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
                 Settings.Global.WIFI_DISPLAY_ON, 0) != 0;
         mWifiDisplayCertificationOn = Settings.Global.getInt(getContentResolver(),
                 Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, 0) != 0;
+        mWpsConfig = Settings.Global.getInt(getContentResolver(),
+            Settings.Global.WIFI_DISPLAY_WPS_CONFIG, WpsInfo.INVALID);
         mWifiDisplayStatus = mDisplayManager.getWifiDisplayStatus();
 
         applyState();
@@ -367,12 +373,41 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
         cbp.setChecked(mAutoGO);
         mCertCategory.addPreference(cbp);
 
-        // Drop down list for choosing listen channel
+        // Drop down list for choosing WPS method (PBC/KEYPAD/DISPLAY)
         ListPreference lp = new ListPreference(getActivity()) {
             @Override
             protected void onDialogClosed(boolean positiveResult) {
                 super.onDialogClosed(positiveResult);
                 if (positiveResult) {
+                    mWpsConfig = Integer.parseInt(getValue());
+                    setSummary("%1$s");
+                    getActivity().invalidateOptionsMenu();
+                    Settings.Global.putInt(getActivity().getContentResolver(),
+                            Settings.Global.WIFI_DISPLAY_WPS_CONFIG, mWpsConfig);
+                }
+            }
+        };
+        mWpsConfig = Settings.Global.getInt(getActivity().getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_WPS_CONFIG, WpsInfo.INVALID);
+        String[] wpsEntries = { "Default", "PBC", "KEYPAD", "DISPLAY" };
+        String[] wpsValues = {
+            "" + WpsInfo.INVALID,
+            "" + WpsInfo.PBC,
+            "" + WpsInfo.KEYPAD,
+            "" + WpsInfo.DISPLAY };
+        lp.setTitle(R.string.wifi_display_wps_config);
+        lp.setEntries(wpsEntries);
+        lp.setEntryValues(wpsValues);
+        lp.setValue("" + mWpsConfig);
+        lp.setSummary("%1$s");
+        mCertCategory.addPreference(lp);
+
+        // Drop down list for choosing listen channel
+        lp = new ListPreference(getActivity()) {
+            @Override
+            protected void onDialogClosed(boolean positiveResult) {
+                super.onDialogClosed(positiveResult);
+                if (positiveResult) {
                     mListenChannel = Integer.parseInt(getValue());
                     setSummary("%1$s");
                     getActivity().invalidateOptionsMenu();
-- 
2.11.0