diff --git a/core/res/res/drawable/ic_wifi_signal_0.xml b/core/res/res/drawable/ic_wifi_signal_0.xml index e732a8dbbf208..cab8be3d34820 100644 --- a/core/res/res/drawable/ic_wifi_signal_0.xml +++ b/core/res/res/drawable/ic_wifi_signal_0.xml @@ -15,12 +15,11 @@ limitations under the License. --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="@android:color/white" + android:pathData="M12,4c3.42,0,6.73,1.27,9.3,3.53L12,18.85L2.7,7.53C5.27,5.27,8.58,4,12,4 M12,2C7.25,2,2.97,4.08,0,7.39L12,22L24,7.39 C21.03,4.08,16.75,2,12,2L12,2z" /> \ No newline at end of file diff --git a/core/res/res/drawable/ic_wifi_signal_1.xml b/core/res/res/drawable/ic_wifi_signal_1.xml index 3d006953fcaad..54b68aeaaaee3 100644 --- a/core/res/res/drawable/ic_wifi_signal_1.xml +++ b/core/res/res/drawable/ic_wifi_signal_1.xml @@ -15,15 +15,14 @@ limitations under the License. --> + android:fillColor="@android:color/white" + android:pathData="M12,2.01c-4.75,0-9.03,2.08-12,5.39L12,22L24,7.4C21.03,4.09,16.75,2.01,12,2.01z M12,18.86L2.7,7.54 C5.27,5.28,8.58,4.01,12,4.01s6.73,1.27,9.3,3.53L12,18.86z" /> - + android:fillColor="@android:color/white" + android:pathData="M16.42,16.63L12,22l-4.42-5.37c0.15-0.74,0.48-1.43,0.95-1.99C9.35,13.64,10.6,13,12,13s2.65,0.64,3.47,1.64 C15.94,15.2,16.27,15.89,16.42,16.63z" /> + \ No newline at end of file diff --git a/core/res/res/drawable/ic_wifi_signal_2.xml b/core/res/res/drawable/ic_wifi_signal_2.xml index 2cce9e90c02b1..52f589502d39a 100644 --- a/core/res/res/drawable/ic_wifi_signal_2.xml +++ b/core/res/res/drawable/ic_wifi_signal_2.xml @@ -15,15 +15,14 @@ limitations under the License. --> + android:fillColor="@android:color/white" + android:pathData="M12,2C7.25,2,2.97,4.08,0,7.39L12,22L24,7.39C21.03,4.08,16.75,2,12,2z M12,18.85L2.7,7.53C5.27,5.27,8.58,4,12,4 s6.73,1.27,9.3,3.53L12,18.85z" /> - + android:fillColor="@android:color/white" + android:pathData="M18.61,13.95L12,22l-6.61-8.05c0.33-0.61,0.74-1.17,1.22-1.66c1.36-1.42,3.27-2.3,5.39-2.3s4.03,0.88,5.39,2.3 C17.87,12.78,18.28,13.34,18.61,13.95z" /> + \ No newline at end of file diff --git a/core/res/res/drawable/ic_wifi_signal_3.xml b/core/res/res/drawable/ic_wifi_signal_3.xml index d3b3d3ad6025f..8e51ed2f53b61 100644 --- a/core/res/res/drawable/ic_wifi_signal_3.xml +++ b/core/res/res/drawable/ic_wifi_signal_3.xml @@ -15,15 +15,14 @@ limitations under the License. --> + android:fillColor="@android:color/white" + android:pathData="M12,2C7.25,2,2.97,4.08,0,7.39L12,22L24,7.39C21.03,4.08,16.75,2,12,2z M12,18.85L2.7,7.53C5.27,5.27,8.58,4,12,4 s6.73,1.27,9.3,3.53L12,18.85z" /> - + android:fillColor="@android:color/white" + android:pathData="M20.7,11.41L12,22L3.3,11.41c0.38-0.52,0.8-0.99,1.26-1.43C6.49,8.13,9.1,6.99,12,6.99s5.51,1.13,7.44,2.99 C19.9,10.41,20.33,10.89,20.7,11.41z" /> + \ No newline at end of file diff --git a/core/res/res/drawable/ic_wifi_signal_4.xml b/core/res/res/drawable/ic_wifi_signal_4.xml index aca4551044ecd..04b63af4a372c 100644 --- a/core/res/res/drawable/ic_wifi_signal_4.xml +++ b/core/res/res/drawable/ic_wifi_signal_4.xml @@ -15,11 +15,11 @@ limitations under the License. --> - + android:fillColor="@android:color/white" + android:pathData="M24,7.39L12,22L0,7.39C2.97,4.08,7.25,2,12,2S21.03,4.08,24,7.39z" /> + \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_1.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_1.xml index 675dfc947b7ed..694b0ddc127fd 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_1.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_1.xml @@ -16,17 +16,13 @@ - - - - + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + + diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_2.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_2.xml index c9a7eb8fd3625..dcb3fa82eb5da 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_2.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_2.xml @@ -16,17 +16,13 @@ - - - - + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + + diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_3.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_3.xml index a6facaed82d8b..d68a2f6fe4265 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_3.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_3.xml @@ -16,17 +16,13 @@ - - - - + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + + diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_4.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_4.xml index 2eae8f5b33181..886cc35343222 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_4.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_4.xml @@ -16,13 +16,13 @@ - - - + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + + diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_detail_empty.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_detail_empty.xml deleted file mode 100644 index 30024dd64a3ea..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_detail_empty.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_disconnected.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_disconnected.xml index cb87caeb1b8d5..3c45761ca4dda 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_disconnected.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_disconnected.xml @@ -14,19 +14,20 @@ limitations under the License. --> - - - - - + android:viewportWidth="24" + android:viewportHeight="24"> + + + + \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_no_network.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_no_network.xml deleted file mode 100644 index e59e7f4b61e3f..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_no_network.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_0.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_0.xml deleted file mode 100644 index 56ca422758fa1..0000000000000 --- a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_0.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_0_fully.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_0_fully.xml deleted file mode 100644 index 737d5a0f3d978..0000000000000 --- a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_0_fully.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_1.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_1.xml deleted file mode 100644 index e5b0d1a948909..0000000000000 --- a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_1.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_1_fully.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_1_fully.xml deleted file mode 100644 index 5d6457044974b..0000000000000 --- a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_1_fully.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_2.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_2.xml deleted file mode 100644 index b3ee86e5cd6a5..0000000000000 --- a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_2.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_2_fully.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_2_fully.xml deleted file mode 100644 index 012e74250e651..0000000000000 --- a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_2_fully.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_3.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_3.xml deleted file mode 100644 index 9b919c1879131..0000000000000 --- a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_3.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_3_fully.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_3_fully.xml deleted file mode 100644 index 5a61d2a69f683..0000000000000 --- a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_3_fully.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_4.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_4.xml deleted file mode 100644 index 144af5af3bdb5..0000000000000 --- a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_4.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_4_fully.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_4_fully.xml deleted file mode 100644 index 6c9f983b41ddc..0000000000000 --- a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_4_fully.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - diff --git a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_null.xml b/packages/SystemUI/res/drawable/stat_sys_wifi_signal_null.xml deleted file mode 100644 index 330daa4d0e7ba..0000000000000 --- a/packages/SystemUI/res/drawable/stat_sys_wifi_signal_null.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - diff --git a/packages/SystemUI/res/layout/status_bar_wifi_group.xml b/packages/SystemUI/res/layout/status_bar_wifi_group.xml index c419b907ab176..35cce25d45a78 100644 --- a/packages/SystemUI/res/layout/status_bar_wifi_group.xml +++ b/packages/SystemUI/res/layout/status_bar_wifi_group.xml @@ -59,10 +59,9 @@ android:layout_width="wrap_content" android:gravity="center_vertical" > + android:layout_height="@dimen/status_bar_wifi_signal_size" + android:layout_width="@dimen/status_bar_wifi_signal_size" /> 2.5dp + + 15dp + 4dp diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java index 3e40cfc0cda20..15df1f161159c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java @@ -200,7 +200,7 @@ public class WifiTile extends QSTileImpl { state.icon = ResourceIcon.get(R.drawable.ic_qs_wifi_disconnected); state.label = r.getString(R.string.quick_settings_wifi_label); } else { - state.icon = ResourceIcon.get(R.drawable.ic_qs_wifi_no_network); + state.icon = ResourceIcon.get(WifiIcons.QS_WIFI_NO_NETWORK); state.label = r.getString(R.string.quick_settings_wifi_label); } minimalContentDescription.append( @@ -415,14 +415,14 @@ public class WifiTile extends QSTileImpl { // Wi-Fi is off if (!mSignalCallback.mInfo.enabled) { - mItems.setEmptyState(R.drawable.ic_qs_wifi_detail_empty, + mItems.setEmptyState(WifiIcons.QS_WIFI_NO_NETWORK, R.string.wifi_is_off); mItems.setItems(null); return; } // No available access points - mItems.setEmptyState(R.drawable.ic_qs_wifi_detail_empty, + mItems.setEmptyState(WifiIcons.QS_WIFI_NO_NETWORK, R.string.quick_settings_wifi_detail_empty_text); // Build the list diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NeutralGoodDrawable.java b/packages/SystemUI/src/com/android/systemui/statusbar/NeutralGoodDrawable.java deleted file mode 100644 index 8642ca4c7d33a..0000000000000 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NeutralGoodDrawable.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.statusbar; - -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.graphics.drawable.LayerDrawable; -import android.view.ContextThemeWrapper; -import android.view.Gravity; - -import com.android.settingslib.Utils; -import com.android.systemui.R; - -/** - * NeutralGoodDrawable implements a drawable that will load 2 underlying drawable resources, one - * with each the DualToneDarkTheme and DualToneLightTheme, choosing which one based on what - * DarkIconDispatcher tells us about darkness - */ -public class NeutralGoodDrawable extends LayerDrawable { - - public static NeutralGoodDrawable create(Context context, int resId) { - int dualToneLightTheme = Utils.getThemeAttr(context, R.attr.lightIconTheme); - int dualToneDarkTheme = Utils.getThemeAttr(context, R.attr.darkIconTheme); - ContextThemeWrapper light = new ContextThemeWrapper(context, dualToneLightTheme); - ContextThemeWrapper dark = new ContextThemeWrapper(context, dualToneDarkTheme); - - return create(light, dark, resId); - } - - /** - * For the on-the-go young entrepreneurial who wants to cache contexts - * @param light - a context using the R.attr.lightIconTheme - * @param dark - a context using the R.attr.darkIconTheme - * @param resId - the resId for our drawable - */ - public static NeutralGoodDrawable create(Context light, Context dark, int resId) { - return new NeutralGoodDrawable( - new Drawable[] { - light.getDrawable(resId).mutate(), - dark.getDrawable(resId).mutate() }); - } - - protected NeutralGoodDrawable(Drawable []drawables) { - super(drawables); - - for (int i = 0; i < drawables.length; i++) { - setLayerGravity(i, Gravity.CENTER); - } - - mutate(); - setDarkIntensity(0); - } - - public void setDarkIntensity(float intensity) { - - getDrawable(0).setAlpha((int) ((1 - intensity) * 255f)); - getDrawable(1).setAlpha((int) (intensity * 255f)); - - invalidateSelf(); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java index c5751c300c011..351627980c089 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarWifiView.java @@ -25,9 +25,7 @@ import static com.android.systemui.statusbar.StatusBarIconView.STATE_ICON; import android.content.Context; import android.content.res.ColorStateList; import android.graphics.Rect; -import android.graphics.drawable.Drawable; import android.util.AttributeSet; -import android.view.ContextThemeWrapper; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -35,7 +33,6 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; -import com.android.settingslib.Utils; import com.android.systemui.R; import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver; import com.android.systemui.statusbar.phone.StatusBarSignalPolicy.WifiIconState; @@ -59,12 +56,8 @@ public class StatusBarWifiView extends FrameLayout implements DarkReceiver, private View mAirplaneSpacer; private WifiIconState mState; private String mSlot; - private float mDarkIntensity = 0; private int mVisibleState = -1; - private ContextThemeWrapper mDarkContext; - private ContextThemeWrapper mLightContext; - public static StatusBarWifiView fromContext(Context context, String slot) { LayoutInflater inflater = LayoutInflater.from(context); StatusBarWifiView v = (StatusBarWifiView) inflater.inflate(R.layout.status_bar_wifi_group, null); @@ -160,11 +153,6 @@ public class StatusBarWifiView extends FrameLayout implements DarkReceiver, } private void init() { - int dualToneLightTheme = Utils.getThemeAttr(mContext, R.attr.lightIconTheme); - int dualToneDarkTheme = Utils.getThemeAttr(mContext, R.attr.darkIconTheme); - mLightContext = new ContextThemeWrapper(mContext, dualToneLightTheme); - mDarkContext = new ContextThemeWrapper(mContext, dualToneDarkTheme); - mWifiGroup = findViewById(R.id.wifi_group); mWifiIcon = findViewById(R.id.wifi_signal); mIn = findViewById(R.id.wifi_in); @@ -209,10 +197,7 @@ public class StatusBarWifiView extends FrameLayout implements DarkReceiver, private boolean updateState(WifiIconState state) { setContentDescription(state.contentDescription); if (mState.resId != state.resId && state.resId >= 0) { - NeutralGoodDrawable drawable = NeutralGoodDrawable - .create(mLightContext, mDarkContext, state.resId); - drawable.setDarkIntensity(mDarkIntensity); - mWifiIcon.setImageDrawable(drawable); + mWifiIcon.setImageDrawable(mContext.getDrawable(mState.resId)); } mIn.setVisibility(state.activityIn ? View.VISIBLE : View.GONE); @@ -237,10 +222,7 @@ public class StatusBarWifiView extends FrameLayout implements DarkReceiver, private void initViewState() { setContentDescription(mState.contentDescription); if (mState.resId >= 0) { - NeutralGoodDrawable drawable = NeutralGoodDrawable.create( - mLightContext, mDarkContext, mState.resId); - drawable.setDarkIntensity(mDarkIntensity); - mWifiIcon.setImageDrawable(drawable); + mWifiIcon.setImageDrawable(mContext.getDrawable(mState.resId)); } mIn.setVisibility(mState.activityIn ? View.VISIBLE : View.GONE); @@ -257,11 +239,8 @@ public class StatusBarWifiView extends FrameLayout implements DarkReceiver, if (!isInArea(area, this)) { return; } - mDarkIntensity = darkIntensity; - Drawable d = mWifiIcon.getDrawable(); - if (d instanceof NeutralGoodDrawable) { - ((NeutralGoodDrawable)d).setDarkIntensity(darkIntensity); - } + + mWifiIcon.setImageTintList(ColorStateList.valueOf(getTint(area, this, tint))); mIn.setImageTintList(ColorStateList.valueOf(getTint(area, this, tint))); mOut.setImageTintList(ColorStateList.valueOf(getTint(area, this, tint))); mDotView.setDecorColor(tint); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java index f629863c53a94..9db109de369bf 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiIcons.java @@ -19,18 +19,6 @@ package com.android.systemui.statusbar.policy; import com.android.systemui.R; public class WifiIcons { - static final int[][] WIFI_SIGNAL_STRENGTH = { - { R.drawable.stat_sys_wifi_signal_0, - R.drawable.stat_sys_wifi_signal_1, - R.drawable.stat_sys_wifi_signal_2, - R.drawable.stat_sys_wifi_signal_3, - R.drawable.stat_sys_wifi_signal_4 }, - { R.drawable.stat_sys_wifi_signal_0_fully, - R.drawable.stat_sys_wifi_signal_1_fully, - R.drawable.stat_sys_wifi_signal_2_fully, - R.drawable.stat_sys_wifi_signal_3_fully, - R.drawable.stat_sys_wifi_signal_4_fully } - }; static final int[] WIFI_FULL_ICONS = { com.android.internal.R.drawable.ic_wifi_signal_0, @@ -40,18 +28,23 @@ public class WifiIcons { com.android.internal.R.drawable.ic_wifi_signal_4 }; + private static final int[] WIFI_NO_INTERNET_ICONS = { + R.drawable.ic_qs_wifi_0, + R.drawable.ic_qs_wifi_1, + R.drawable.ic_qs_wifi_2, + R.drawable.ic_qs_wifi_3, + R.drawable.ic_qs_wifi_4 + }; + public static final int[][] QS_WIFI_SIGNAL_STRENGTH = { - { R.drawable.ic_qs_wifi_0, - R.drawable.ic_qs_wifi_1, - R.drawable.ic_qs_wifi_2, - R.drawable.ic_qs_wifi_3, - R.drawable.ic_qs_wifi_4 }, + WIFI_NO_INTERNET_ICONS, WIFI_FULL_ICONS - }; + }; + static final int[][] WIFI_SIGNAL_STRENGTH = QS_WIFI_SIGNAL_STRENGTH; public static final int QS_WIFI_DISABLED = com.android.internal.R.drawable.ic_wifi_signal_0; - static final int QS_WIFI_NO_NETWORK = R.drawable.ic_qs_wifi_no_network; - static final int WIFI_NO_NETWORK = R.drawable.stat_sys_wifi_signal_null; + public static final int QS_WIFI_NO_NETWORK = com.android.internal.R.drawable.ic_wifi_signal_0; + static final int WIFI_NO_NETWORK = QS_WIFI_NO_NETWORK; static final int WIFI_LEVEL_COUNT = WIFI_SIGNAL_STRENGTH[0].length; }