Create configure Wi-Fi screen
Add a gear on Settings menu, and move a bunch of stuff from overflow and advanced screen to there. Also move add network to be the last item in the list rather than in overflow. Also fix WifiP2p breakage. Change-Id: I5c84c25e5ba9224f77dcd988b0b2850ae6e71168
This commit is contained in:
@@ -23,7 +23,6 @@ import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceViewHolder;
|
||||
import android.text.TextUtils;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
public class WifiP2pPeer extends Preference {
|
||||
@@ -41,15 +40,18 @@ public class WifiP2pPeer extends Preference {
|
||||
device = dev;
|
||||
setWidgetLayoutResource(R.layout.preference_widget_wifi_signal);
|
||||
mRssi = 60; //TODO: fix
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(PreferenceViewHolder view) {
|
||||
if (TextUtils.isEmpty(device.deviceName)) {
|
||||
setTitle(device.deviceAddress);
|
||||
} else {
|
||||
setTitle(device.deviceName);
|
||||
}
|
||||
String[] statusArray = context.getResources().getStringArray(R.array.wifi_p2p_status);
|
||||
setSummary(statusArray[device.status]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(PreferenceViewHolder view) {
|
||||
super.onBindViewHolder(view);
|
||||
mSignal = (ImageView) view.findViewById(R.id.signal);
|
||||
if (mRssi == Integer.MAX_VALUE) {
|
||||
mSignal.setImageDrawable(null);
|
||||
@@ -57,8 +59,7 @@ public class WifiP2pPeer extends Preference {
|
||||
mSignal.setImageResource(R.drawable.wifi_signal_dark);
|
||||
mSignal.setImageState(STATE_SECURED, true);
|
||||
}
|
||||
refresh();
|
||||
super.onBindViewHolder(view);
|
||||
mSignal.setImageLevel(getLevel());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -87,14 +88,4 @@ public class WifiP2pPeer extends Preference {
|
||||
}
|
||||
return WifiManager.calculateSignalLevel(mRssi, SIGNAL_LEVELS);
|
||||
}
|
||||
|
||||
private void refresh() {
|
||||
if (mSignal == null) {
|
||||
return;
|
||||
}
|
||||
Context context = getContext();
|
||||
mSignal.setImageLevel(getLevel());
|
||||
String[] statusArray = context.getResources().getStringArray(R.array.wifi_p2p_status);
|
||||
setSummary(statusArray[device.status]);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user