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

Removed the FooterPreferenceMixin from the TetherSettings page.

Fixes: 139397226
Test: manual test
Change-Id: Ice7f97881df9cc17177ed7fcc1da9f3124c445a9
---
 res/xml/tether_prefs.xml                     | 6 ++++++
 src/com/android/settings/TetherSettings.java | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index 70a57d7c98a..3f9b8c8fffd 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -44,4 +44,10 @@
         android:summary="@string/tether_settings_disabled_on_data_saver"
         android:selectable="false"
         settings:allowDividerAbove="true" />
+
+    <com.android.settingslib.widget.FooterPreference
+        android:key="tether_prefs_footer"
+        android:title="@string/tethering_footer_info"
+        android:selectable="false"
+        settings:searchable="false"/>
 </PreferenceScreen>
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 20b6e2f7efb..a6cbcb00f18 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -120,9 +120,6 @@ public class TetherSettings extends RestrictedSettingsFragment
         super.onCreate(icicle);
 
         addPreferencesFromResource(R.xml.tether_prefs);
-        mFooterPreferenceMixin.createFooterPreference()
-            .setTitle(R.string.tethering_footer_info);
-
         mDataSaverBackend = new DataSaverBackend(getContext());
         mDataSaverEnabled = mDataSaverBackend.isDataSaverEnabled();
         mDataSaverFooter = findPreference(KEY_DATA_SAVER_FOOTER);