From da2d426d495488af74443b607660f10c44e46f95 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 9 Jan 2017 16:58:41 -0800
Subject: [PATCH] Create MeteredPreference with correct preference context.

Bug: 33775510
Test: visual
Change-Id: I201e685f70379e48053ee910113d5ce75fddc16e
---
 res/xml/data_usage_metered_prefs.xml                        | 5 ++---
 .../settings/datausage/DataUsageMeteredSettings.java        | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/res/xml/data_usage_metered_prefs.xml b/res/xml/data_usage_metered_prefs.xml
index 5915101c312..a1f3110216c 100644
--- a/res/xml/data_usage_metered_prefs.xml
+++ b/res/xml/data_usage_metered_prefs.xml
@@ -35,9 +35,8 @@
 
     </PreferenceCategory>
 
-    <Preference
-        android:summary="@string/data_usage_metered_body"
-        android:persistent="false"
+    <com.android.settings.widget.FooterPreference
+        android:title="@string/data_usage_metered_body"
         android:selectable="false" />
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/datausage/DataUsageMeteredSettings.java b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
index 94a44f8031a..19828873182 100644
--- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
@@ -96,7 +96,7 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme
         if (hasWifiRadio(context) && mWifiManager.isWifiEnabled()) {
             for (WifiConfiguration config : mWifiManager.getConfiguredNetworks()) {
                 if (config.SSID != null) {
-                    mWifiCategory.addPreference(buildWifiPref(context, config));
+                    mWifiCategory.addPreference(buildWifiPref(config));
                 }
             }
         } else {
@@ -113,10 +113,10 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme
         return pref;
     }
 
-    private Preference buildWifiPref(Context context, WifiConfiguration config) {
+    private Preference buildWifiPref(WifiConfiguration config) {
         final String networkId = config.SSID;
         final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(networkId);
-        final MeteredPreference pref = new MeteredPreference(context, template);
+        final MeteredPreference pref = new MeteredPreference(getPrefContext(), template);
         pref.setTitle(removeDoubleQuotes(networkId));
         return pref;
     }