PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi-display: add drop down list for Wps config method

Browse Source 
Bug: 9371882

Change-Id: I8c8c645bbb3db9f9d038f015f6aa6078ce3e56c3
This commit is contained in:
Chong Zhang
2013-08-29 15:33:12 -07:00
parent 8df4caf168
commit 4fee070366
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1274,6 +1274,8 @@
<string name="wifi_display_pause">Pause</string> <string name="wifi_display_pause">Pause</string>
<!-- Wifi Display settings. The button text for sending play (resume) trigger during certification process. [CHAR LIMIT=40] --> <!-- Wifi Display settings. The button text for sending play (resume) trigger during certification process. [CHAR LIMIT=40] -->
<string name="wifi_display_resume">Resume</string> <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] --> <!-- 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> <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] --> <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->

37
src/com/android/settings/wfd/WifiDisplaySettings.java
View File

@@ -33,6 +33,7 @@ import android.net.Uri;
import android.net.wifi.p2p.WifiP2pManager; import android.net.wifi.p2p.WifiP2pManager;
import android.net.wifi.p2p.WifiP2pManager.ActionListener; import android.net.wifi.p2p.WifiP2pManager.ActionListener;
import android.net.wifi.p2p.WifiP2pManager.Channel; import android.net.wifi.p2p.WifiP2pManager.Channel;
import android.net.wifi.WpsInfo;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
@@ -94,6 +95,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
private PreferenceGroup mCertCategory; private PreferenceGroup mCertCategory;
private boolean mListen; private boolean mListen;
private boolean mAutoGO; private boolean mAutoGO;
private int mWpsConfig = WpsInfo.INVALID;
private int mListenChannel; private int mListenChannel;
private int mOperatingChannel; private int mOperatingChannel;
@@ -160,6 +162,8 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
Settings.Global.WIFI_DISPLAY_ON), false, mSettingsObserver); Settings.Global.WIFI_DISPLAY_ON), false, mSettingsObserver);
getContentResolver().registerContentObserver(Settings.Global.getUriFor( getContentResolver().registerContentObserver(Settings.Global.getUriFor(
Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON), false, mSettingsObserver); Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON), false, mSettingsObserver);
getContentResolver().registerContentObserver(Settings.Global.getUriFor(
Settings.Global.WIFI_DISPLAY_WPS_CONFIG), false, mSettingsObserver);
mDisplayManager.scanWifiDisplays(); mDisplayManager.scanWifiDisplays();
@@ -222,6 +226,8 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
Settings.Global.WIFI_DISPLAY_ON, 0) != 0; Settings.Global.WIFI_DISPLAY_ON, 0) != 0;
mWifiDisplayCertificationOn = Settings.Global.getInt(getContentResolver(), mWifiDisplayCertificationOn = Settings.Global.getInt(getContentResolver(),
Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, 0) != 0; Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, 0) != 0;
mWpsConfig = Settings.Global.getInt(getContentResolver(),
Settings.Global.WIFI_DISPLAY_WPS_CONFIG, WpsInfo.INVALID);
mWifiDisplayStatus = mDisplayManager.getWifiDisplayStatus(); mWifiDisplayStatus = mDisplayManager.getWifiDisplayStatus();
applyState(); applyState();
@@ -367,8 +373,37 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
cbp.setChecked(mAutoGO); cbp.setChecked(mAutoGO);
mCertCategory.addPreference(cbp); 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()) { 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 @Override
protected void onDialogClosed(boolean positiveResult) { protected void onDialogClosed(boolean positiveResult) {
super.onDialogClosed(positiveResult); super.onDialogClosed(positiveResult);