PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1726b2c9: Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev

Browse Source 
* commit '1726b2c94d994843abe43283465be7c049763b94':
  Added contentDescription for fingerprint on the confirmCredential screen
This commit is contained in:
Selim Cinek
2015-06-23 22:02:04 +00:00
committed by Android Git Automerger
parent cee7423220 1726b2c94d
commit ae3693d44f
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/confirm_lock_password_base.xml
View File

@@ -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>

1
res/layout/confirm_lock_pattern_base.xml
View File

@@ -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>

3
res/values/strings.xml
View File

@@ -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>