diff options
| -rw-r--r-- | packages/SettingsLib/res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/packages/SettingsLib/res/values/attrs.xml b/packages/SettingsLib/res/values/attrs.xml index 1f35d3e286e9..ea538fb320b1 100644 --- a/packages/SettingsLib/res/values/attrs.xml +++ b/packages/SettingsLib/res/values/attrs.xml @@ -36,6 +36,9 @@ <declare-styleable name="WifiEncryptionState"> <attr name="state_encrypted" format="boolean" /> </declare-styleable> + <declare-styleable name="WifiMeteredState"> + <attr name="state_metered" format="boolean" /> + </declare-styleable> <declare-styleable name="WifiSavedState"> <attr name="state_saved" format="boolean" /> </declare-styleable> diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java index a9aaa05cb674..8f8167ee8187 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); |