diff options
| author | George Mount <mount@google.com> | 2014-04-29 20:49:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-29 20:49:26 +0000 |
| commit | 6eb2bc52a56d05eca03518bce1a65a7c496d27bf (patch) | |
| tree | 348b6829897e95d9f35caeeca767cf3e996b9dd8 /api | |
| parent | d0b12fe4a2deadd78141ada10818c531226ac9d2 (diff) | |
| parent | f976c3d42bc2f14333bae5ed26d96c45d207a443 (diff) | |
| download | frameworks_base-6eb2bc52a56d05eca03518bce1a65a7c496d27bf.zip frameworks_base-6eb2bc52a56d05eca03518bce1a65a7c496d27bf.tar.gz frameworks_base-6eb2bc52a56d05eca03518bce1a65a7c496d27bf.tar.bz2 | |
Merge "Add ability to exclude Views in transition XML."
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 30f1c9e..150af9a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -501,7 +501,9 @@ package android { field public static final int entries = 16842930; // 0x10100b2 field public static final int entryValues = 16843256; // 0x10101f8 field public static final int eventsInterceptionEnabled = 16843389; // 0x101027d + field public static final int excludeClass = 16843854; // 0x101044e field public static final int excludeFromRecents = 16842775; // 0x1010017 + field public static final int excludeId = 16843853; // 0x101044d field public static final int exitFadeDuration = 16843533; // 0x101030d field public static final int expandableListPreferredChildIndicatorLeft = 16842834; // 0x1010052 field public static final int expandableListPreferredChildIndicatorRight = 16842835; // 0x1010053 |