Merge "Fix for wifi detail icon disappearing" into oc-dev

This commit is contained in:
TreeHugger Robot
2017-05-31 16:28:51 +00:00
committed by Android (Google) Code Review

View File

@@ -353,13 +353,20 @@ public class WifiTile extends QSTileImpl<SignalState> {
private void updateItems() { private void updateItems() {
if (mItems == null) return; if (mItems == null) return;
if (mSignalCallback.mInfo.enabled) {
mItems.setEmptyState(R.drawable.ic_qs_wifi_detail_empty, // Wi-Fi is off
R.string.quick_settings_wifi_detail_empty_text); if (!mSignalCallback.mInfo.enabled) {
} else {
mItems.setEmptyState(R.drawable.ic_qs_wifi_detail_empty, mItems.setEmptyState(R.drawable.ic_qs_wifi_detail_empty,
R.string.wifi_is_off); R.string.wifi_is_off);
mItems.setItems(null);
return;
} }
// No available access points
mItems.setEmptyState(R.drawable.ic_qs_wifi_detail_empty,
R.string.quick_settings_wifi_detail_empty_text);
// Build the list
Item[] items = null; Item[] items = null;
if (mAccessPoints != null) { if (mAccessPoints != null) {
items = new Item[mAccessPoints.length]; items = new Item[mAccessPoints.length];