diff options
| author | James Cook <jamescook@google.com> | 2015-02-26 20:34:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-26 20:34:16 +0000 |
| commit | 14a92fe75d22757f03128e15eb6265c5427373bc (patch) | |
| tree | 849bc7a6eda77e7d02ea8514fc95de7e2484bb9f /api | |
| parent | 32e819131bc4952d73f830d6580788609dc6af09 (diff) | |
| parent | c8f08e07a47cc259a25caed3f731ee7044328635 (diff) | |
| download | frameworks_base-14a92fe75d22757f03128e15eb6265c5427373bc.zip frameworks_base-14a92fe75d22757f03128e15eb6265c5427373bc.tar.gz frameworks_base-14a92fe75d22757f03128e15eb6265c5427373bc.tar.bz2 | |
Merge "Revert "Add basic support for Ctrl-Z to editable TextViews""
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 3d12275..16dfcf7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -1710,10 +1710,9 @@ package android { field public static final int message = 16908299; // 0x102000b field public static final int navigationBarBackground = 16908336; // 0x1020030 field public static final int paste = 16908322; // 0x1020022 - field public static final int pasteAsPlainText = 16908339; // 0x1020033 + field public static final int pasteAsPlainText = 16908337; // 0x1020031 field public static final int primary = 16908300; // 0x102000c field public static final int progress = 16908301; // 0x102000d - field public static final int redo = 16908338; // 0x1020032 field public static final int secondaryProgress = 16908303; // 0x102000f field public static final int selectAll = 16908319; // 0x102001f field public static final int selectTextMode = 16908333; // 0x102002d @@ -1730,7 +1729,6 @@ package android { field public static final int text2 = 16908309; // 0x1020015 field public static final int title = 16908310; // 0x1020016 field public static final int toggle = 16908311; // 0x1020017 - field public static final int undo = 16908337; // 0x1020031 field public static final int widget_frame = 16908312; // 0x1020018 } diff --git a/api/system-current.txt b/api/system-current.txt index 71a991a..1e9d64a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1786,10 +1786,9 @@ package android { field public static final int message = 16908299; // 0x102000b field public static final int navigationBarBackground = 16908336; // 0x1020030 field public static final int paste = 16908322; // 0x1020022 - field public static final int pasteAsPlainText = 16908339; // 0x1020033 + field public static final int pasteAsPlainText = 16908337; // 0x1020031 field public static final int primary = 16908300; // 0x102000c field public static final int progress = 16908301; // 0x102000d - field public static final int redo = 16908338; // 0x1020032 field public static final int secondaryProgress = 16908303; // 0x102000f field public static final int selectAll = 16908319; // 0x102001f field public static final int selectTextMode = 16908333; // 0x102002d @@ -1806,7 +1805,6 @@ package android { field public static final int text2 = 16908309; // 0x1020015 field public static final int title = 16908310; // 0x1020016 field public static final int toggle = 16908311; // 0x1020017 - field public static final int undo = 16908337; // 0x1020031 field public static final int widget_frame = 16908312; // 0x1020018 } |