diff --git a/packages/SettingsLib/res/values/attrs.xml b/packages/SettingsLib/res/values/attrs.xml index 1f35d3e286e96..ea538fb320b1e 100644 --- a/packages/SettingsLib/res/values/attrs.xml +++ b/packages/SettingsLib/res/values/attrs.xml @@ -36,6 +36,9 @@ + + + diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java index a9aaa05cb6747..8f8167ee81875 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java @@ -44,6 +44,10 @@ public class AccessPointPreference extends Preference { R.attr.state_encrypted }; + private static final int[] STATE_METERED = { + R.attr.state_metered + }; + private static final int[] wifi_friction_attributes = { R.attr.wifi_friction }; private final StateListDrawable mFrictionSld; @@ -179,6 +183,8 @@ public class AccessPointPreference extends Preference { } if (mAccessPoint.getSecurity() != AccessPoint.SECURITY_NONE) { mFrictionSld.setState(STATE_SECURED); + } else if (mAccessPoint.getConfig() != null && mAccessPoint.getConfig().meteredHint) { + mFrictionSld.setState(STATE_METERED); } Drawable drawable = mFrictionSld.getCurrent(); frictionImageView.setImageDrawable(drawable);