am 7358b7d5: am e78840ff: am 42eff3b7: am 52448442: Use default encryption password if an accessibility service is enabled.

* commit '7358b7d56286d1896f833bbd9d970b83dfb5fed1':
  Use default encryption password if an accessibility service is enabled.
This commit is contained in:
Svetoslav
2014-10-02 12:37:18 +00:00
committed by Android Git Automerger
4 changed files with 51 additions and 0 deletions

View File

@@ -28,6 +28,12 @@
android:paddingStart="16dip"
android:paddingEnd="16dip" >
<TextView android:id="@+id/encryption_warning"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="10dip"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<TextView android:id="@+id/capabilities_header"
android:layout_width="fill_parent"
android:layout_height="wrap_content"

View File

@@ -3665,6 +3665,14 @@
<!-- Title for the list of capabilities of an accessibility service. -->
<string name="capabilities_list_title"><xliff:g id="service" example="TalkBack">%1$s</xliff:g>
needs to:</string>
<!-- Warning that the device data will not be encrypted with password or PIN if
enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->
<string name="enable_service_encryption_warning">If you turn on <xliff:g id="service"
example="TalkBack">%1$s</xliff:g>, your data\'s encryption won\'t be as strong.</string>
<!-- Warning that the device data will not be encrypted with password or PIN if
choosing a secure lock and there is an enabled accessibility service. [CHAR LIMIT=NONE] -->
<string name="secure_lock_encryption_warning">Because you\'ve turned on an accessibility service,
encryption based on this type of lock won\'t be as strong.</string>
<!-- Title for the capability of an accessibility service to receive events and keys. -->
<string name="capability_title_receiveAccessibilityEvents">Observe your actions</string>