diff options
| author | Svetoslav <svetoslavganov@google.com> | 2014-10-17 18:53:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 18:53:32 +0000 |
| commit | b363c26e2f3255ad891d0fd466c9bbd2794a734d (patch) | |
| tree | 54f443480fd23ca5e05bd84f66903118dc0d79bd /res | |
| parent | 2106c79bc28324aa2bb3658b19c58551ddc1cc14 (diff) | |
| parent | 431e246032d58b8aae72d348107f0d2aaa9efbac (diff) | |
| download | packages_apps_Settings-b363c26e2f3255ad891d0fd466c9bbd2794a734d.zip packages_apps_Settings-b363c26e2f3255ad891d0fd466c9bbd2794a734d.tar.gz packages_apps_Settings-b363c26e2f3255ad891d0fd466c9bbd2794a734d.tar.bz2 | |
am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.
* commit '431e246032d58b8aae72d348107f0d2aaa9efbac':
User to confirm credentials if an accessibility service changes encryption.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-sw600dp-land/confirm_lock_password.xml | 2 | ||||
| -rw-r--r-- | res/layout-sw600dp/confirm_lock_password.xml | 3 | ||||
| -rw-r--r-- | res/layout/confirm_lock_password.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 15 |
4 files changed, 18 insertions, 5 deletions
diff --git a/res/layout-sw600dp-land/confirm_lock_password.xml b/res/layout-sw600dp-land/confirm_lock_password.xml index e3cc20c..cbaad7a 100644 --- a/res/layout-sw600dp-land/confirm_lock_password.xml +++ b/res/layout-sw600dp-land/confirm_lock_password.xml @@ -41,7 +41,7 @@ android:layout_marginBottom="10dip" android:gravity="start" android:ellipsize="marquee" - android:textAppearance="?android:attr/textAppearanceLarge" + android:textAppearance="?android:attr/textAppearanceMedium" /> <!-- Password entry field --> diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml index 9e236d5..12b6ab2 100644 --- a/res/layout-sw600dp/confirm_lock_password.xml +++ b/res/layout-sw600dp/confirm_lock_password.xml @@ -30,8 +30,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" - android:lines="2" - android:textAppearance="?android:attr/textAppearanceLarge"/> + android:textAppearance="?android:attr/textAppearanceMedium"/> <!-- spacer above text entry field --> <View diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml index 0ea4c52..c9a0bbe 100644 --- a/res/layout/confirm_lock_password.xml +++ b/res/layout/confirm_lock_password.xml @@ -30,8 +30,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" - android:lines="2" - android:textAppearance="?android:attr/textAppearanceLarge"/> + android:textAppearance="?android:attr/textAppearanceMedium"/> <!-- Password entry field --> <EditText android:id="@+id/password_entry" diff --git a/res/values/strings.xml b/res/values/strings.xml index 5192ff6..4fea1d5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3675,6 +3675,21 @@ <string name="secure_lock_encryption_warning">Because you\'ve turned on an accessibility service, your device won’t use your screen lock to enhance data encryption.</string> + <!-- Message to the user to enter his pattern before enabling an accessibility service. [CHAR LIMIT=NONE] --> + <string name="enable_service_pattern_reason">Turning on <xliff:g id="service" + example="TalkBack">%1$s</xliff:g> reduces data protection. + </string> + + <!-- Message to the user to enter his PIN before enabling an accessibility service. [CHAR LIMIT=NONE] --> + <string name="enable_service_pin_reason">Turning on <xliff:g id="service" + example="TalkBack">%1$s</xliff:g> reduces data protection. + </string> + + <!-- Message to the user to enter his password before enabling an accessibility service. [CHAR LIMIT=NONE] --> + <string name="enable_service_password_reason">Turning on <xliff:g id="service" + example="TalkBack">%1$s</xliff:g> reduces data protection. + </string> + <!-- Title for the capability of an accessibility service to receive events and keys. --> <string name="capability_title_receiveAccessibilityEvents">Observe your actions</string> <!-- Description for the capability of an accessibility service to receive events and keys. --> |