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

Commit 7090c92f authored by Andres Morales's avatar Andres Morales Committed by Android (Google) Code Review
Browse files

Merge "Update enable oem unlock warning" into lmp-mr1-dev

parents 9209ce85 26b46882
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -3385,17 +3385,17 @@
    <!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
    <string name="bt_hci_snoop_log_summary">Capture all bluetooth HCI packets in a file</string>
    <!-- setting Checkbox title whether to enable OEM unlock [CHAR_LIMIT=35] -->
    <string name="oem_unlock_enable">Enable OEM unlock</string>
    <string name="oem_unlock_enable">OEM unlocking</string>
    <!-- setting Checkbox summary whether to enable OEM unlock [CHAR_LIMIT=50] -->
    <string name="oem_unlock_enable_summary">Allow the device to be OEM unlocked</string>
    <string name="oem_unlock_enable_summary">Allow the bootloader to be unlocked</string>
    <!-- Message to enter device PIN to enable OEM unlock -->
    <string name="oem_unlock_enable_pin_prompt">Enter your PIN</string>
    <!-- Explanation to enter device pin to enable OEM unlock -->
    <string name="oem_unlock_enable_pin_description">Enter your device PIN to enable OEM unlock</string>
    <!-- Confirmation dialog title to ensure user wishes to enable OEM unlock and disable theft protection features -->
    <string name="confirm_enable_oem_unlock_title">Warning</string>
    <!-- Confirmation dialog message to ensure user wishes to enable OEM unlock and disable theft protection features -->
    <string name="confirm_enable_oem_unlock_text">Enabling OEM unlock disables theft protection features on this device and may void your warranty. Continue?</string>
    <string name="confirm_enable_oem_unlock_title">Allow OEM unlocking?</string>
    <!-- Warning dialog message to confirm user wishes to enable OEM unlock and disable theft protection features -->
    <string name="confirm_enable_oem_unlock_text">WARNING: Device protection features will not work on this device while this setting is turned on.</string>


    <!-- Setting Checkbox title whether to show options for wireless display certification -->
+1 −1
Original line number Diff line number Diff line
@@ -1291,7 +1291,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
        new AlertDialog.Builder(getActivity())
                .setTitle(R.string.confirm_enable_oem_unlock_title)
                .setMessage(R.string.confirm_enable_oem_unlock_text)
                .setPositiveButton(R.string.yes, onConfirmListener)
                .setPositiveButton(R.string.enable_text, onConfirmListener)
                .setNegativeButton(android.R.string.cancel, null)
                .create()
                .show();