diff options
| author | Selim Cinek <cinek@google.com> | 2015-07-27 20:51:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-27 20:51:57 +0000 |
| commit | 71bfb27013f983bc4a54f1924af61c07732f994e (patch) | |
| tree | a080c49a29da5c697233c83836703b1e26b0381c | |
| parent | fc28d6fc9dec30e4cd98cc894d596f7df986f5b9 (diff) | |
| parent | 3974e603acb42ba64199df97580fc017b0c21d94 (diff) | |
| download | frameworks_base-71bfb27013f983bc4a54f1924af61c07732f994e.zip frameworks_base-71bfb27013f983bc4a54f1924af61c07732f994e.tar.gz frameworks_base-71bfb27013f983bc4a54f1924af61c07732f994e.tar.bz2 | |
Merge "Added the content description for the fingerprint icon" into mnc-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 3 |
4 files changed, 7 insertions, 0 deletions
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 @@ 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 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 @@ 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 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. --> |