diff options
| author | James Cook <jamescook@google.com> | 2015-02-27 20:44:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-27 20:44:45 +0000 |
| commit | 7af589995f8036bc9e622ec54fc29492152f926f (patch) | |
| tree | b0a9d88ddcc2eda2df8be867b3b5fdf73d518e4e /api | |
| parent | 07a65f444a88a8acf727700f5e23c3a537466e6a (diff) | |
| parent | f59152cf00520d1bd36949b44faca2e1fcf6d28f (diff) | |
| download | frameworks_base-7af589995f8036bc9e622ec54fc29492152f926f.zip frameworks_base-7af589995f8036bc9e622ec54fc29492152f926f.tar.gz frameworks_base-7af589995f8036bc9e622ec54fc29492152f926f.tar.bz2 | |
Merge "Reland: Add basic support for Ctrl-Z to editable TextViews"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 285d75d..e92e9f4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -1719,6 +1719,7 @@ package android { 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 = 16908339; // 0x1020033 field public static final int secondaryProgress = 16908303; // 0x102000f field public static final int selectAll = 16908319; // 0x102001f field public static final int selectTextMode = 16908333; // 0x102002d @@ -1735,6 +1736,7 @@ 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 = 16908338; // 0x1020032 field public static final int widget_frame = 16908312; // 0x1020018 } diff --git a/api/system-current.txt b/api/system-current.txt index 0393896..29ebf57 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1795,6 +1795,7 @@ package android { 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 = 16908339; // 0x1020033 field public static final int secondaryProgress = 16908303; // 0x102000f field public static final int selectAll = 16908319; // 0x102001f field public static final int selectTextMode = 16908333; // 0x102002d @@ -1811,6 +1812,7 @@ 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 = 16908338; // 0x1020032 field public static final int widget_frame = 16908312; // 0x1020018 } |