From 6e21c76111b6ee28c967c6a101dd521e663a5d52 Mon Sep 17 00:00:00 2001
From: Sunny Shao <sunnyshao@google.com>
Date: Thu, 15 Aug 2019 15:56:10 +0800
Subject: [PATCH] Use FooterPreference in xml explicitly

Removed the FooterPreferenceMixin from the ManageAssist page.

Fixes: 139457944
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.applications
Change-Id: I89b6cac21e924774a1fcfe790863d8eaab8d6da7
---
 res/xml/manage_assist.xml                                 | 6 ++++++
 .../settings/applications/assist/ManageAssist.java        | 8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/res/xml/manage_assist.xml b/res/xml/manage_assist.xml
index bb387b5bdeb..ef0f6969a78 100644
--- a/res/xml/manage_assist.xml
+++ b/res/xml/manage_assist.xml
@@ -53,4 +53,10 @@
         android:title="@string/voice_input_settings_title"
         android:fragment="com.android.settings.applications.assist.DefaultVoiceInputPicker" />
 
+    <com.android.settingslib.widget.FooterPreference
+        android:key="manage_assist_footer"
+        android:title="@string/assist_footer"
+        android:selectable="false"
+        settings:searchable="false"/>
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/applications/assist/ManageAssist.java b/src/com/android/settings/applications/assist/ManageAssist.java
index 952a3ad8960..ae2728d0dd9 100644
--- a/src/com/android/settings/applications/assist/ManageAssist.java
+++ b/src/com/android/settings/applications/assist/ManageAssist.java
@@ -68,14 +68,6 @@ public class ManageAssist extends DashboardFragment {
         use(AssistGestureSettingsPreferenceController.class).setAssistOnly(true);
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        mFooterPreferenceMixin.createFooterPreference()
-                .setTitle(R.string.assist_footer);
-    }
-
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();