From 5cceb312fdb6ee6c6d22aec0996977501017e505 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Mon, 20 Jul 2015 15:35:21 -0700
Subject: [PATCH] [ScreenLock] Change title for RedactionInterstitial

Change the title for RedactionInterstital to "Notifications".

Bug: 22587892
Change-Id: Ib0e32fa8913924ae74aa412703a5f6234fd62fe4
---
 res/layout/setup_redaction_interstitial.xml                   | 2 +-
 res/values/strings.xml                                        | 3 +++
 .../android/settings/notification/RedactionInterstitial.java  | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/res/layout/setup_redaction_interstitial.xml b/res/layout/setup_redaction_interstitial.xml
index 826e6330856..f5954a197a1 100644
--- a/res/layout/setup_redaction_interstitial.xml
+++ b/res/layout/setup_redaction_interstitial.xml
@@ -22,7 +22,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     settings:suwBackgroundTile="@drawable/setup_illustration_tile"
-    settings:suwHeaderText="@string/notification_section_header"
+    settings:suwHeaderText="@string/lock_screen_notifications_interstitial_title"
     settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
     settings:suwIllustrationImage="@drawable/setup_illustration_lock_screen">
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5c57f83bc46..1518f6b1ecc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6019,6 +6019,9 @@
     <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Message asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=NONE] -->
     <string name="lock_screen_notifications_interstitial_message">When your device is locked, how do you want notifications to show?</string>
 
+    <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=30] -->
+    <string name="lock_screen_notifications_interstitial_title">Notifications</string>
+
     <!-- Sound & notification > Notification section: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
     <string name="app_notifications_title">App notifications</string>
 
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index a0d12192df9..a47b7034afa 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -60,7 +60,9 @@ public class RedactionInterstitial extends SettingsActivity {
                     .putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, true)
                     .putExtra(EXTRA_PREFS_SET_BACK_TEXT, (String) null)
                     .putExtra(EXTRA_PREFS_SET_NEXT_TEXT, ctx.getString(
-                            R.string.app_notifications_dialog_done));
+                            R.string.app_notifications_dialog_done))
+                    .putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID,
+                            R.string.lock_screen_notifications_interstitial_title);
         }
     }