diff --git a/api/current.txt b/api/current.txt index 878a2a9adfbdd..032b2cbe3c0c7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 diff --git a/api/system-current.txt b/api/system-current.txt index 2846f5839df77..3b8f584c30067 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 diff --git a/api/test-current.txt b/api/test-current.txt index 6cdaef3979d8d..da31235d8e747 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 9ccd7f0a77ddb..50c7bfbd0d0f3 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -593,6 +593,9 @@ i the appearance matches the branding of the app requesting the fingerprint scan.--> + + + diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 06e2248bbb5a6..2b0ef4266ee15 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2705,6 +2705,7 @@ +