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

Removed the FooterPreferenceMixin from the ZenModeBlockedEffectsSettings page.

Fixes: 139258311
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.notification
Change-Id: I0367390ffb27743e394db3108b3992fee1b943a7
---
 res/xml/zen_mode_block_settings.xml                        | 7 +++++++
 .../notification/ZenModeBlockedEffectsSettings.java        | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/res/xml/zen_mode_block_settings.xml b/res/xml/zen_mode_block_settings.xml
index cccc63c8a39..1b04fb8b1ed 100644
--- a/res/xml/zen_mode_block_settings.xml
+++ b/res/xml/zen_mode_block_settings.xml
@@ -17,6 +17,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="zen_mode_block_settings_page"
     android:title="@string/zen_mode_what_to_block_title">
 
@@ -57,4 +58,10 @@
            android:title="@string/zen_mode_block_effect_list" />
    </PreferenceCategory>
 
+    <com.android.settingslib.widget.FooterPreference
+        android:key="zen_mode_block_footer"
+        android:title="@string/zen_mode_blocked_effects_footer"
+        android:selectable="false"
+        settings:searchable="false"/>
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java
index 613bd355c00..9cb3f599777 100644
--- a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java
+++ b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java
@@ -45,8 +45,6 @@ public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implement
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        mFooterPreferenceMixin.createFooterPreference().setTitle(
-                R.string.zen_mode_blocked_effects_footer);
     }
 
     @Override