PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev

Browse Source 
* commit '8ebd1e2c06d8526dd8a3081d743bc77ee565fc10':
  [ScreenLock] Change title for RedactionInterstitial
This commit is contained in:
Maurice Lam
2015-07-21 00:49:49 +00:00
committed by Android Git Automerger
parent a8f8879895 8ebd1e2c06
commit 135c8869fe
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/setup_redaction_interstitial.xml
View File

@@ -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">

3
res/values/strings.xml
View File

@@ -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>

4
src/com/android/settings/notification/RedactionInterstitial.java
View File

@@ -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);
}
}