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

Commit 114ef308 authored by Selim Cinek's avatar Selim Cinek
Browse files

resolved conflicts for merge of f3da5dc7 to master 

Change-Id: I2013f1cb6b258b81f7d415a5e0f7daaa4eb7de80
parent 56de6313

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1809,6 +1809,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
@@ -1907,6 +1907,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
@@ -2653,6 +2653,8 @@ 
    <public type="id" name="accessibilityActionScrollRight" id="0x0102003b" />

    <public type="id" name="accessibilityActionContextClick" id="0x0102003c" />



    <public type="string" name="fingerprint_icon_content_description" />



  <!-- ===============================================================

       Resources added in version N of the platform

       =============================================================== -->

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