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

Merge "Refresh peer list when entering wifi p2p settings"

Browse Source
This commit is contained in:
Yuhao Zheng
2013-10-15 00:25:28 +00:00
committed by Android (Google) Code Review
parent 13ccffdb6b 5d2169eb6f
commit b8b3f5bee0
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/wifi/p2p/WifiP2pSettings.java
View File

@@ -34,7 +34,7 @@ import android.net.wifi.p2p.WifiP2pDeviceList;
import android.net.wifi.p2p.WifiP2pGroup; import android.net.wifi.p2p.WifiP2pGroup;
import android.net.wifi.p2p.WifiP2pGroupList; import android.net.wifi.p2p.WifiP2pGroupList;
import android.net.wifi.p2p.WifiP2pManager; import android.net.wifi.p2p.WifiP2pManager;
import android.net.wifi.p2p.WifiP2pManager.GroupInfoListener; import android.net.wifi.p2p.WifiP2pManager.PeerListListener;
import android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener; import android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener;
import android.net.wifi.WpsInfo; import android.net.wifi.WpsInfo;
import android.os.Bundle; import android.os.Bundle;
@@ -67,7 +67,7 @@ import java.util.Collection;
* Displays Wi-fi p2p settings UI * Displays Wi-fi p2p settings UI
*/ */
public class WifiP2pSettings extends SettingsPreferenceFragment public class WifiP2pSettings extends SettingsPreferenceFragment
implements PersistentGroupInfoListener, GroupInfoListener { implements PersistentGroupInfoListener, PeerListListener {
private static final String TAG = "WifiP2pSettings"; private static final String TAG = "WifiP2pSettings";
private static final boolean DBG = false; private static final boolean DBG = false;
@@ -89,7 +89,6 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
private boolean mWifiP2pEnabled; private boolean mWifiP2pEnabled;
private boolean mWifiP2pSearching; private boolean mWifiP2pSearching;
private int mConnectedDevices; private int mConnectedDevices;
private WifiP2pGroup mConnectedGroup;
private boolean mLastGroupFormed = false; private boolean mLastGroupFormed = false;
private PreferenceGroup mPeersGroup; private PreferenceGroup mPeersGroup;
@@ -129,9 +128,6 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
WifiP2pManager.EXTRA_NETWORK_INFO); WifiP2pManager.EXTRA_NETWORK_INFO);
WifiP2pInfo wifip2pinfo = (WifiP2pInfo) intent.getParcelableExtra( WifiP2pInfo wifip2pinfo = (WifiP2pInfo) intent.getParcelableExtra(
WifiP2pManager.EXTRA_WIFI_P2P_INFO); WifiP2pManager.EXTRA_WIFI_P2P_INFO);
if (mWifiP2pManager != null) {
mWifiP2pManager.requestGroupInfo(mChannel, WifiP2pSettings.this);
}
if (networkInfo.isConnected()) { if (networkInfo.isConnected()) {
if (DBG) Log.d(TAG, "Connected"); if (DBG) Log.d(TAG, "Connected");
} else if (mLastGroupFormed != true) { } else if (mLastGroupFormed != true) {
@@ -320,12 +316,17 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
getActivity().registerReceiver(mReceiver, mIntentFilter); getActivity().registerReceiver(mReceiver, mIntentFilter);
if (mWifiP2pManager != null) {
mWifiP2pManager.requestPeers(mChannel, WifiP2pSettings.this);
}
} }
@Override @Override
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
mWifiP2pManager.stopPeerDiscovery(mChannel, null); if (mWifiP2pManager != null) {
mWifiP2pManager.stopPeerDiscovery(mChannel, null);
}
getActivity().unregisterReceiver(mReceiver); getActivity().unregisterReceiver(mReceiver);
} }
@@ -534,10 +535,10 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
} }
@Override @Override
public void onGroupInfoAvailable(WifiP2pGroup group) { public void onPeersAvailable(WifiP2pDeviceList peers) {
if (DBG) Log.d(TAG, " group " + group); if (DBG) Log.d(TAG, "Requested peers are available");
mConnectedGroup = group; mPeers = peers;
updateDevicePref(); handlePeersChanged();
} }
private void handleP2pStateChanged() { private void handleP2pStateChanged() {