summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2015-07-21 00:22:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-21 00:22:03 +0000
commitaf57ec8831d3047400a6bcbc8c5e73fc3888b7d3 (patch)
treec789cfaf2e2b1c00c20723817094a420e19daa8e /src/com/android
parent3977df037c1cdd1bef92e3f4195c6e7b847a1c28 (diff)
parent5cceb312fdb6ee6c6d22aec0996977501017e505 (diff)
downloadpackages_apps_Settings-af57ec8831d3047400a6bcbc8c5e73fc3888b7d3.zip
packages_apps_Settings-af57ec8831d3047400a6bcbc8c5e73fc3888b7d3.tar.gz
packages_apps_Settings-af57ec8831d3047400a6bcbc8c5e73fc3888b7d3.tar.bz2
Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/settings/notification/RedactionInterstitial.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index a0d1219..a47b703 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);
}
}