summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJames Cook <jamescook@google.com>2015-02-26 18:03:58 -0800
committerJames Cook <jamescook@google.com>2015-02-27 10:04:08 -0800
commitf59152cf00520d1bd36949b44faca2e1fcf6d28f (patch)
tree13343a7f5d90fb2448be52f42901e3ed940798f2 /api
parent39df5fea2281161246cce37587d2a3c34f3dcf32 (diff)
downloadframeworks_base-f59152cf00520d1bd36949b44faca2e1fcf6d28f.zip
frameworks_base-f59152cf00520d1bd36949b44faca2e1fcf6d28f.tar.gz
frameworks_base-f59152cf00520d1bd36949b44faca2e1fcf6d28f.tar.bz2
Reland: Add basic support for Ctrl-Z to editable TextViews
Reland 9201e797833f35b9afb219f88c10d3b6fda02a4e which was reverted in c8f08e07a47cc259a25caed3f731ee7044328635. Original description: * Add an UndoManager to the Editor for each editable TextView * Record operations as being owned by that Editor * Parcel the undo state * Wire hardware keyboard shortcuts Ctrl-Z for undo and Ctrl-Shift-Z for redo into TextView shortcut handling. * Expose IDs for "undo" and "redo" for symmetry with cut/copy/paste. Additional fix: * Ensure each UndoOwner always has a valid mManager, even after the UndoManager is parceled and restored. Bug: 19332904 Bug: 19505388 Change-Id: Iad4476e6e9ca952281e69bf22c07cca915dfa7bd
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
2 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 16dfcf7..5fad22c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1713,6 +1713,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
@@ -1729,6 +1730,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 1e9d64a..ae9b296 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1789,6 +1789,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
@@ -1805,6 +1806,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
}