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

Commit f3c491dc authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "FBE notification improvements - change language for FBE "account... 

Merge "FBE notification improvements - change language for FBE "account locked" notification - use lock icon"
parents c6739525 e6c28031

core/res/res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -4191,10 +4191,10 @@ 
    <string name="new_sms_notification_content">Open SMS app to view</string>



    <!-- Notification title shown when user profile is credential encrypted and requires the user to unlock before some features are usable [CHAR LIMIT=30] -->

    <string name="user_encrypted_title">Device encrypted</string>

    <string name="user_encrypted_title">Some functions might not be available</string>

    <!-- Notification message shown when user profile is credential encrypted and requires the user to unlock before some features are usable [CHAR LIMIT=30] -->

    <string name="user_encrypted_message">Some functions might not be available</string>

    <string name="user_encrypted_message">Touch to continue</string>

    <!-- Notification detail shown when user profile is credential encrypted and requires the user to unlock before some features are usable [CHAR LIMIT=30] -->

    <string name="user_encrypted_detail">Touch to continue</string>

    <string name="user_encrypted_detail">User profile locked</string>



</resources>

services/core/java/com/android/server/LockSettingsService.java

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
                PendingIntent.FLAG_UPDATE_CURRENT);



        Notification notification = new Notification.Builder(mContext)

                .setSmallIcon(com.android.internal.R.drawable.stat_sys_warning)

                .setSmallIcon(com.android.internal.R.drawable.ic_secure)

                .setWhen(0)

                .setOngoing(true)

                .setTicker(title)