diff options
| author | James Cook <jamescook@google.com> | 2015-02-27 22:35:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-27 22:35:15 +0000 |
| commit | 99e6d7a17acc97f20f1300c25a69f8831b055ef2 (patch) | |
| tree | fdbcda39166ced261d88e0b4c962425e2bff71fe /api | |
| parent | bcd42a8d5a3b63ea22d5c88c19979934bf3b70c2 (diff) | |
| parent | f1dad1ea82c5d9ca920af39b81ac6894ff692b99 (diff) | |
| download | frameworks_base-99e6d7a17acc97f20f1300c25a69f8831b055ef2.zip frameworks_base-99e6d7a17acc97f20f1300c25a69f8831b055ef2.tar.gz frameworks_base-99e6d7a17acc97f20f1300c25a69f8831b055ef2.tar.bz2 | |
Merge "Add TextView XML attribute for undo support"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 80ca6cc..a9cd058 100644 --- a/api/current.txt +++ b/api/current.txt @@ -297,6 +297,7 @@ package android { field public static final int allowParallelSyncs = 16843570; // 0x1010332 field public static final int allowSingleTap = 16843353; // 0x1010259 field public static final int allowTaskReparenting = 16843268; // 0x1010204 + field public static final int allowUndo = 16844006; // 0x10104e6 field public static final int alpha = 16843551; // 0x101031f field public static final int alphabeticShortcut = 16843235; // 0x10101e3 field public static final int alwaysDrawnWithCache = 16842991; // 0x10100ef diff --git a/api/system-current.txt b/api/system-current.txt index 8ec0bb0..52586ed 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -369,6 +369,7 @@ package android { field public static final int allowParallelSyncs = 16843570; // 0x1010332 field public static final int allowSingleTap = 16843353; // 0x1010259 field public static final int allowTaskReparenting = 16843268; // 0x1010204 + field public static final int allowUndo = 16844006; // 0x10104e6 field public static final int alpha = 16843551; // 0x101031f field public static final int alphabeticShortcut = 16843235; // 0x10101e3 field public static final int alwaysDrawnWithCache = 16842991; // 0x10100ef |