From 3b29ff25590f67525901cce1217c6ba980ce3acb Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Thu, 13 Feb 2020 11:17:04 -0500
Subject: [PATCH] Mode dnd title back to title bar

Test: manual
Fixes: 149183896
Change-Id: Ib5e0c3c79e3b36f58d9196a8435250230275a3f7
---
 res/layout/zen_mode_settings_button.xml | 7 -------
 res/xml/zen_mode_settings.xml           | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/res/layout/zen_mode_settings_button.xml b/res/layout/zen_mode_settings_button.xml
index 14fe644c568..49aa28779aa 100644
--- a/res/layout/zen_mode_settings_button.xml
+++ b/res/layout/zen_mode_settings_button.xml
@@ -22,13 +22,6 @@
     android:orientation="vertical"
     android:paddingVertical="@dimen/zen_mode_button_padding_vertical">
 
-    <TextView
-        android:text="@string/zen_mode_settings_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/screen_margin_sides"
-        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"/>
-
     <TextView
         android:text="@string/zen_mode_settings_summary"
         android:layout_width="wrap_content"
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index a55c6be38fc..ce2d1322c9a 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -18,7 +18,7 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:title=" ">
+    android:title="@string/zen_mode_settings_title">
 
     <!-- Turn on DND button -->
     <com.android.settingslib.widget.LayoutPreference