Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71bfb270 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Added the content description for the fingerprint icon" into mnc-dev

parents fc28d6fc 3974e603

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -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. -->