diff options
| author | Selim Cinek <cinek@google.com> | 2015-06-23 21:50:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 21:50:27 +0000 |
| commit | 1726b2c94d994843abe43283465be7c049763b94 (patch) | |
| tree | 80c2e6ebc56bebbb9b6f6fb2f8b4004eae4e824f /res | |
| parent | 96a0614409e9bdc2df6dd83bc151a0d00eaf2ced (diff) | |
| parent | cf8347b33ffb8162de2681f58bfb90855337c499 (diff) | |
| download | packages_apps_Settings-1726b2c94d994843abe43283465be7c049763b94.zip packages_apps_Settings-1726b2c94d994843abe43283465be7c049763b94.tar.gz packages_apps_Settings-1726b2c94d994843abe43283465be7c049763b94.tar.bz2 | |
Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/confirm_lock_password_base.xml | 1 | ||||
| -rw-r--r-- | res/layout/confirm_lock_pattern_base.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml index 069708f..b20131a 100644 --- a/res/layout/confirm_lock_password_base.xml +++ b/res/layout/confirm_lock_password_base.xml @@ -85,6 +85,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_marginBottom="24dp" + android:contentDescription="@string/confirm_fingerprint_icon_content_description" android:visibility="gone"/> </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
\ No newline at end of file diff --git a/res/layout/confirm_lock_pattern_base.xml b/res/layout/confirm_lock_pattern_base.xml index cd2cbef..a69d297 100644 --- a/res/layout/confirm_lock_pattern_base.xml +++ b/res/layout/confirm_lock_pattern_base.xml @@ -88,6 +88,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_marginBottom="24dp" + android:contentDescription="@string/confirm_fingerprint_icon_content_description" android:visibility="gone"/> </LinearLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 120c701..667d07f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -777,6 +777,9 @@ <!-- Text shown when "Add fingerprint" button is disabled --> <string name="fingerprint_add_max">You can add up to <xliff:g id="count" example="5">%d</xliff:g> fingerprints</string> + <!-- Content description for the fingerprint icon when the user is prompted to enter his credentials. Not shown on the screen. [CHAR LIMIT=NONE] --> + <string name="confirm_fingerprint_icon_content_description">Use your fingerprint to continue.</string> + <!-- Title of the preferences category for preference items to control encryption --> <string name="crypt_keeper_settings_title">Encryption</string> |