Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 71bfb270: Merge "Added the content description for the fingerprint icon" into mnc-dev

Browse Source 
* commit '71bfb27013f983bc4a54f1924af61c07732f994e':
  Added the content description for the fingerprint icon
This commit is contained in:
Selim Cinek
2015-07-27 21:02:47 +00:00
committed by Android Git Automerger
parent 48a90091b1 71bfb27013
commit 73156901a0
4 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -1807,6 +1807,7 @@ package android {
field public static final int defaultVoiceMailAlphaTag = 17039364; // 0x1040004
field public static final int dialog_alert_title = 17039380; // 0x1040014
field public static final int emptyPhoneNumber = 17039366; // 0x1040006
field public static final int fingerprint_icon_content_description = 17039384; // 0x1040018
field public static final int httpErrorBadUrl = 17039367; // 0x1040007
field public static final int httpErrorUnsupportedScheme = 17039368; // 0x1040008
field public static final int no = 17039369; // 0x1040009

1
api/system-current.txt
View File

@@ -1905,6 +1905,7 @@ package android {
field public static final int defaultVoiceMailAlphaTag = 17039364; // 0x1040004
field public static final int dialog_alert_title = 17039380; // 0x1040014
field public static final int emptyPhoneNumber = 17039366; // 0x1040006
field public static final int fingerprint_icon_content_description = 17039384; // 0x1040018
field public static final int httpErrorBadUrl = 17039367; // 0x1040007
field public static final int httpErrorUnsupportedScheme = 17039368; // 0x1040008
field public static final int no = 17039369; // 0x1040009

2
core/res/res/values/public.xml
View File

@@ -2652,4 +2652,6 @@
<public type="id" name="accessibilityActionScrollDown" id="0x0102003a" />
<public type="id" name="accessibilityActionScrollRight" id="0x0102003b" />
<public type="id" name="accessibilityActionContextClick" id="0x0102003c" />
<public type="string" name="fingerprint_icon_content_description" />
</resources>

3
core/res/res/values/strings.xml
View File

@@ -1221,6 +1221,9 @@
<string-array name="fingerprint_error_vendor">
</string-array>
<!-- Content description which should be used for the fingerprint icon. -->
<string name="fingerprint_icon_content_description">Fingerprint icon</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_readSyncSettings">read sync settings</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->