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

Commit 1d838f62 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix UI issues in localization" into main am: ce20ff98 am: 97f10147 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3151118



Change-Id: Ie31bd52681f014bc6166ab0409cdf2ec55b2f0fc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents febb0822 97f10147

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -12383,7 +12383,7 @@ 
    <!-- Toast on failure to reformat data to ext4 -->

    <string name="format_ext4_failure_toast">Failed to reformat and wipe the data partition to ext4.</string>

    <!-- Dialog to OEM unlock the device before using 16K developer option -->

    <string name="confirm_oem_unlock_for_16k_title">Bootloader Unlock Required for 16KB Mode</string>

    <string name="confirm_oem_unlock_for_16k_title">Bootloader Unlock Required</string>

    <string name="confirm_oem_unlock_for_16k_text">This device needs to have the bootloader unlocked before using the 16KB developer option.

        Software integrity cannot be guaranteed in this mode, and any data stored on the phone while the bootloader is unlocked may be at risk.

        All user data and settings will be wiped when activating 16KB mode. Once the bootloader is unlocked, activating the 16KB option will require two reboots.
@@ -12412,10 +12412,10 @@ 
    <!-- persistent notification 16k page agnostic mode text -->

    <string name="page_agnostic_16k_pages_text_short">You are in the 16KB mode of the page-agnostic mode. Software integrity cannot be guaranteed in this mode,

        and any data stored on the phone while the bootloader is unlocked may be at risk. Some features will be disabled in these modes, so some applications may not work.

        In order to re-enter the production mode, you must, switch back to 4K mode and then lock the bootloader of the device. Tap to read more.</string>

        In order to re-enter the production mode, you must, switch back to 4KB mode and then lock the bootloader of the device. Tap to read more.</string>

    <string name="page_agnostic_16k_pages_text">You are in the 16KB mode of the page-agnostic mode. Software integrity cannot be guaranteed in this mode,

        and any data stored on the phone while the bootloader is unlocked may be at risk. Some features will be disabled in these modes, so some applications may not work.

        In order to re-enter the production mode, you must, switch back to 4K mode and then lock the bootloader of the device. This would factory reset the device again and

        In order to re-enter the production mode, you must, switch back to 4KB mode and then lock the bootloader of the device. This would factory reset the device again and

        restore it to production settings. After the device successfully boots into Android, disable OEM unlocking in Developer options.

        If the device fails to boot into Android or is unstable, re-flash the device with the latest factory images from

        &lt;a href=\"https://developers.google.com/android/images\"&gt;https://developers.google.com/android/images&lt;/a&gt;

src/com/android/settings/development/PageAgnosticNotificationService.java

+1 −1
Original line number Diff line number Diff line
@@ -96,13 +96,13 @@ public class PageAgnosticNotificationService extends Service { 
                                notifyPendingIntent)

                        .build();



        // TODO:(b/349860833) Change text style to BigTextStyle once the ellipsis issue is fixed.

        Notification.Builder builder =

                new Notification.Builder(this, NOTIFICATION_CHANNEL_ID)

                        .setContentTitle(title)

                        .setContentText(text)

                        .setOngoing(true)

                        .setSmallIcon(R.drawable.ic_settings_24dp)

                        .setStyle(new Notification.BigTextStyle().bigText(text))

                        .setContentIntent(notifyPendingIntent)

                        .addAction(action);