Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af57ec88 authored by Maurice Lam's avatar Maurice Lam Committed by Android (Google) Code Review
Browse files

Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev

parents 3977df03 5cceb312
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
@@ -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>
+3 −1
Original line number Diff line number Diff line
@@ -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);
        }
    }