From aed318ef076ed220ea9d9c26c52885c18f951c75 Mon Sep 17 00:00:00 2001
From: Stephen Chen <stewchen@google.com>
Date: Fri, 31 Mar 2017 16:58:38 -0700
Subject: [PATCH] Add friction icon for metered networks.

Bug:36100548
Test: manual inspection.
Change-Id: If7bad4028879a5cc6176cfe189b91f4756114612
---
 packages/SettingsLib/res/values/attrs.xml                   | 3 +++
 .../com/android/settingslib/wifi/AccessPointPreference.java | 6 ++++++
 2 files changed, 9 insertions(+)

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 @@
     <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 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);