From a47e7ddcc3a409acc52f0918eb2e696de8323fc1 Mon Sep 17 00:00:00 2001
From: Sunny Shao <sunnyshao@google.com>
Date: Wed, 14 Aug 2019 12:56:50 +0800
Subject: [PATCH] Use FooterPreference in xml explicitly

Removed the FooterPreferenceMixin from the DataSaverSummary page.

Fixes: 139393749
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datausage
Change-Id: Ie229acd903eb24e369beef8bbf5ff0bdd9ce50d1
---
 res/xml/data_saver.xml                                   | 6 ++++++
 src/com/android/settings/datausage/DataSaverSummary.java | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/res/xml/data_saver.xml b/res/xml/data_saver.xml
index 19944e22858..e884d6d68c2 100644
--- a/res/xml/data_saver.xml
+++ b/res/xml/data_saver.xml
@@ -27,4 +27,10 @@
         android:fragment="com.android.settings.datausage.UnrestrictedDataAccess"
         settings:controller="com.android.settings.applications.specialaccess.DataSaverController" />
 
+    <com.android.settingslib.widget.FooterPreference
+        android:key="data_saver_footer"
+        android:title="@*android:string/data_saver_description"
+        android:selectable="false"
+        settings:searchable="false"/>
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java
index 1ab8c79ad9d..a2106d9e89b 100644
--- a/src/com/android/settings/datausage/DataSaverSummary.java
+++ b/src/com/android/settings/datausage/DataSaverSummary.java
@@ -63,8 +63,6 @@ public class DataSaverSummary extends SettingsPreferenceFragment
         super.onCreate(icicle);
 
         addPreferencesFromResource(R.xml.data_saver);
-        mFooterPreferenceMixin.createFooterPreference()
-                .setTitle(com.android.internal.R.string.data_saver_description);
         mUnrestrictedAccess = findPreference(KEY_UNRESTRICTED_ACCESS);
         mApplicationsState = ApplicationsState.getInstance(
                 (Application) getContext().getApplicationContext());