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

Depend on support lib preferences

Browse Source 
Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
This commit is contained in:
Jason Monk
2015-09-10 15:52:51 -04:00
parent 136ed7b6b2
commit 39b467482d
308 changed files with 2684 additions and 1762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/wifi/p2p/WifiP2pPeer.java
View File

@@ -16,16 +16,16 @@
package com.android.settings.wifi.p2p;
import com.android.settings.R;
import android.content.Context;
import android.net.wifi.WifiManager;
import android.net.wifi.p2p.WifiP2pDevice;
import android.preference.Preference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import com.android.settings.R;
public class WifiP2pPeer extends Preference {
private static final int[] STATE_SECURED = {R.attr.state_encrypted};
@@ -44,7 +44,7 @@ public class WifiP2pPeer extends Preference {
}
@Override
protected void onBindView(View view) {
public void onBindViewHolder(PreferenceViewHolder view) {
if (TextUtils.isEmpty(device.deviceName)) {
setTitle(device.deviceAddress);
} else {
@@ -58,7 +58,7 @@ public class WifiP2pPeer extends Preference {
mSignal.setImageState(STATE_SECURED, true);
}
refresh();
super.onBindView(view);
super.onBindViewHolder(view);
}
@Override

8
src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java
View File

@@ -18,8 +18,8 @@ package com.android.settings.wifi.p2p;
import android.content.Context;
import android.net.wifi.p2p.WifiP2pGroup;
import android.preference.Preference;
import android.view.View;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
public class WifiP2pPersistentGroup extends Preference {
@@ -31,9 +31,9 @@ public class WifiP2pPersistentGroup extends Preference {
}
@Override
protected void onBindView(View view) {
public void onBindViewHolder(PreferenceViewHolder view) {
setTitle(mGroup.getNetworkName());
super.onBindView(view);
super.onBindViewHolder(view);
}
int getNetworkId() {

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

@@ -26,22 +26,22 @@ import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.content.IntentFilter;
import android.net.NetworkInfo;
import android.net.wifi.WpsInfo;
import android.net.wifi.p2p.WifiP2pConfig;
import android.net.wifi.p2p.WifiP2pInfo;
import android.net.wifi.p2p.WifiP2pDevice;
import android.net.wifi.p2p.WifiP2pDeviceList;
import android.net.wifi.p2p.WifiP2pGroup;
import android.net.wifi.p2p.WifiP2pGroupList;
import android.net.wifi.p2p.WifiP2pInfo;
import android.net.wifi.p2p.WifiP2pManager;
import android.net.wifi.p2p.WifiP2pManager.PeerListListener;
import android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener;
import android.net.wifi.WpsInfo;
import android.os.Bundle;
import android.os.SystemProperties;
import android.preference.Preference;
import android.preference.PreferenceCategory;
import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen;
import android.text.InputFilter;
import android.text.TextUtils;
import android.util.Log;
@@ -301,16 +301,16 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
preferenceScreen.removeAll();
preferenceScreen.setOrderingAsAdded(true);
mThisDevicePref = new Preference(getActivity());
mThisDevicePref = new Preference(getPrefContext());
mThisDevicePref.setPersistent(false);
mThisDevicePref.setSelectable(false);
preferenceScreen.addPreference(mThisDevicePref);
mPeersGroup = new PreferenceCategory(getActivity());
mPeersGroup = new PreferenceCategory(getPrefContext());
mPeersGroup.setTitle(R.string.wifi_p2p_peer_devices);
preferenceScreen.addPreference(mPeersGroup);
mPersistentGroup = new PreferenceCategory(getActivity());
mPersistentGroup = new PreferenceCategory(getPrefContext());
mPersistentGroup.setTitle(R.string.wifi_p2p_remembered_groups);
preferenceScreen.addPreference(mPersistentGroup);
@@ -381,7 +381,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
}
@Override
public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
public boolean onPreferenceTreeClick(Preference preference) {
if (preference instanceof WifiP2pPeer) {
mSelectedWifiPeer = (WifiP2pPeer) preference;
if (mSelectedWifiPeer.device.status == WifiP2pDevice.CONNECTED) {
@@ -423,7 +423,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
mSelectedGroup = (WifiP2pPersistentGroup) preference;
showDialog(DIALOG_DELETE_GROUP);
}
return super.onPreferenceTreeClick(screen, preference);
return super.onPreferenceTreeClick(preference);
}
@Override