am 71bfb270: Merge "Added the content description for the fingerprint icon" into mnc-dev
* commit '71bfb27013f983bc4a54f1924af61c07732f994e':
Added the content description for the fingerprint icon
diff --git a/api/current.txt b/api/current.txt
index 7c5115f..16c1880 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1807,6 +1807,7 @@
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
diff --git a/api/system-current.txt b/api/system-current.txt
index a08a011..7c473a9 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1905,6 +1905,7 @@
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
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 568e61e..85b6c12 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -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>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 35c1f0e..a45a0fa 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -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. -->