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

Commit 262a8f2a authored by Martijn Coenen's avatar Martijn Coenen Committed by Android (Google) Code Review
Browse files

Merge "NFC antenna location asset." into nyc-dev

parents 01ef02d7 842cae44

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -879,6 +879,7 @@ package android { 
    field public static final int nextFocusLeft = 16842977; // 0x10100e1

    field public static final int nextFocusRight = 16842978; // 0x10100e2

    field public static final int nextFocusUp = 16842979; // 0x10100e3

    field public static final int nfcAntennaPositionDrawable = 16844063; // 0x101051f

    field public static final int noHistory = 16843309; // 0x101022d

    field public static final int normalScreens = 16843397; // 0x1010285

    field public static final int notificationTimeout = 16843651; // 0x1010383

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -974,6 +974,7 @@ package android { 
    field public static final int nextFocusLeft = 16842977; // 0x10100e1

    field public static final int nextFocusRight = 16842978; // 0x10100e2

    field public static final int nextFocusUp = 16842979; // 0x10100e3

    field public static final int nfcAntennaPositionDrawable = 16844063; // 0x101051f

    field public static final int noHistory = 16843309; // 0x101022d

    field public static final int normalScreens = 16843397; // 0x1010285

    field public static final int notificationTimeout = 16843651; // 0x1010383

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -879,6 +879,7 @@ package android { 
    field public static final int nextFocusLeft = 16842977; // 0x10100e1

    field public static final int nextFocusRight = 16842978; // 0x10100e2

    field public static final int nextFocusUp = 16842979; // 0x10100e3

    field public static final int nfcAntennaPositionDrawable = 16844063; // 0x101051f

    field public static final int noHistory = 16843309; // 0x101022d

    field public static final int normalScreens = 16843397; // 0x1010285

    field public static final int notificationTimeout = 16843651; // 0x1010383

core/res/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -593,6 +593,9 @@ i 
             the appearance matches the branding of the app requesting the fingerprint scan.-->

        <attr name="fingerprintAuthDrawable" format="reference" />



	<!-- Asset that should be used to show users the position of the NFC antenna on the device. -->

	<attr name="nfcAntennaPositionDrawable" format="reference" />



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

        <!-- Panel styles -->

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

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2705,6 +2705,7 @@ 
    <public type="attr" name="countDown" />

    <public type="attr" name="canRecord" />

    <public type="attr" name="tunerCount" />

    <public type="attr" name="nfcAntennaPositionDrawable" />



    <public type="style" name="Theme.Material.Light.DialogWhenLarge.DarkActionBar" />

    <public type="style" name="Widget.Material.SeekBar.Discrete" />