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

Concurrency wifi p2p and client operation support

Browse Source 
Change-Id: I095b7e7ce143cc37ec454a8e43ed579258d72ea1
This commit is contained in:
Irfan Sheriff
2012-01-10 16:24:19 -08:00
parent faee5f4bdf
commit d37422a3a0
2 changed files with 1 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,7 +74,6 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
private OnClickListener mDisconnectListener;
private WifiP2pPeer mSelectedWifiPeer;
private WifiP2pEnabler mWifiP2pEnabler;
private boolean mWifiP2pEnabled;
private boolean mWifiP2pSearching;
private int mConnectedDevices;
@@ -162,25 +161,6 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
}
};
Switch actionBarSwitch = new Switch(activity);
if (activity instanceof PreferenceActivity) {
PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
actionBarSwitch.setPadding(0, 0, padding, 0);
activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
ActionBar.DISPLAY_SHOW_CUSTOM);
activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(
ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT,
Gravity.CENTER_VERTICAL | Gravity.RIGHT));
}
}
mWifiP2pEnabler = new WifiP2pEnabler(activity, actionBarSwitch);
final PreferenceScreen preferenceScreen = getPreferenceScreen();
preferenceScreen.removeAll();
@@ -194,7 +174,6 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
@Override
public void onResume() {
super.onResume();
mWifiP2pEnabler.resume();
getActivity().registerReceiver(mReceiver, mIntentFilter);
startSearch();
}
@@ -202,7 +181,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
@Override
public void onPause() {
super.onPause();
mWifiP2pEnabler.pause();
mWifiP2pManager.stopPeerDiscovery(mChannel, null);
getActivity().unregisterReceiver(mReceiver);
}