More CryptKeeper UI work.
* Implemented failure case. * More pixel perfect * Remove the animation * Display the encroid on the blank screen * Remove the back button. * Fix portrait mode screens Bug: 3384231 Bug: 3394103 Bug: 3388721 Bug: 3381450 Bug: 3406278 Bug: 3351832 Change-Id: Ib763c8b577198deb45255acc767bc6d5409efc0c
This commit is contained in:
@@ -111,7 +111,6 @@
|
||||
<!-- Title for a notification shown. -->
|
||||
<string name="sdcard_setting" product="default">SD card</string>
|
||||
|
||||
|
||||
<!-- Battery Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
|
||||
<string name="battery_info_status_label">Battery status:</string>
|
||||
<!-- Battery Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
|
||||
@@ -141,7 +140,6 @@
|
||||
<!-- Battery Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
|
||||
<string name="battery_info_screen_on">Screen ON time:</string>
|
||||
|
||||
|
||||
<!-- Battery Info screen. Value for a status item. Used for diagnostic info screens, precise translation isn't needed -->
|
||||
<string name="battery_info_status_unknown">Unknown</string>
|
||||
<!-- Battery Info screen. Value for a status item. Used for diagnostic info screens, precise translation isn't needed -->
|
||||
@@ -493,7 +491,6 @@
|
||||
<!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
|
||||
<string name="radio_controls_summary">Manage Wi-Fi, Bluetooth, airplane mode, mobile networks, & VPNs</string>
|
||||
|
||||
|
||||
<!-- mobile network settings screen, setting check box title -->
|
||||
<string name="roaming">Data roaming</string>
|
||||
<!-- mobile network settings screen, setting option summary text when check box is selected -->
|
||||
@@ -619,7 +616,7 @@
|
||||
an hour or more. You must start with a charged battery and keep your phone plugged in
|
||||
until encryption is complete. If you interrupt the encryption process, you will lose
|
||||
some or all of your data.</string>
|
||||
|
||||
|
||||
<!-- Button text to start encryption process -->
|
||||
<string name="crypt_keeper_button_text" product="tablet">Encrypt tablet</string>
|
||||
<!-- Button text to start encryption process -->
|
||||
@@ -659,9 +656,29 @@
|
||||
<string name="crypt_keeper_setup_description" product="default">Please wait while your phone
|
||||
is being encrypted. ^1% complete.</string>
|
||||
|
||||
<!-- Informational text on the progress screen when encrypting the device has a problem -->
|
||||
<!-- Informational text on the password entry screen when password entry fails-->
|
||||
<string name="crypt_keeper_cooldown">Try again in ^1 seconds.</string>
|
||||
|
||||
|
||||
<!-- Informational text on the password entry screen prompting the user for their password -->
|
||||
<string name="crypt_keeper_enter_password">Enter your password</string>
|
||||
|
||||
<!-- Title of the encryption screen when encrypting the device failed -->
|
||||
<string name="crypt_keeper_failed_title">Encryption failed</string>
|
||||
|
||||
<!-- Informational text when encryption fails -->
|
||||
<string name="crypt_keeper_failed_summary" product="tablet">
|
||||
Encryption was interrupted and can\'t complete. You must perform a factory data reset (erasing
|
||||
all your data) before you can resume using your tablet. You can try encrypting your tablet
|
||||
again after the reset is complete.
|
||||
</string>
|
||||
|
||||
<!-- Informational text when encryption fails -->
|
||||
<string name="crypt_keeper_failed_summary" product="default">
|
||||
Encryption was interrupted and can\'t complete. You must perform a factory data reset (erasing
|
||||
all your data) before you can resume using your phone. You can try encrypting your phone
|
||||
again after the reset is complete.
|
||||
</string>
|
||||
|
||||
<!-- Unlock Picker Settings --><skip />
|
||||
|
||||
<!-- Security Picker --><skip />
|
||||
@@ -1160,7 +1177,6 @@
|
||||
<!-- Default access point SSID used for tethering -->
|
||||
<string name="wifi_tether_configure_ssid_default">AndroidHotspot</string>
|
||||
|
||||
|
||||
<!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
|
||||
Wi-Fi Testing on the diagnostic screen-->
|
||||
<string name="testing_wifi_info" translatable="false">Wifi information</string>
|
||||
|
@@ -121,18 +121,10 @@
|
||||
<item name="android:windowIsFloating">true</item>
|
||||
</style>
|
||||
|
||||
<style name="CryptKeeperTheme" parent="@android:style/Theme.Holo.NoActionBar">
|
||||
<item name="android:windowAnimationStyle">@style/CryptKeeperAnimation</item>
|
||||
</style>
|
||||
|
||||
<style name="CryptKeeperBlankTheme" parent="@android:style/Theme.Holo.NoActionBar">
|
||||
<item name="android:background">#ff000000</item>
|
||||
</style>
|
||||
|
||||
<style name="CryptKeeperAnimation">
|
||||
<item name="android:windowExitAnimation">@anim/crypt_keeper_exit</item>
|
||||
</style>
|
||||
|
||||
<style name="SecurityPreferenceButtonContainer" parent="@android:style/Holo.SegmentedButton">
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
|
Reference in New Issue
Block a user