summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2014-04-09 23:01:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-09 23:01:02 +0000
commit8e1f918738abf70a4dc86dbb12b386a9deea37f8 (patch)
tree2f8b775662768ed77b50ec5740e5d7af608e56c8 /core/java/android/widget
parent3c86a27d3e9044d04d0f176e59a1ebbcd774a54c (diff)
parent8de65a8e05285df52a1e6f0c1d5616dd233298a7 (diff)
downloadframeworks_base-8e1f918738abf70a4dc86dbb12b386a9deea37f8.zip
frameworks_base-8e1f918738abf70a4dc86dbb12b386a9deea37f8.tar.gz
frameworks_base-8e1f918738abf70a4dc86dbb12b386a9deea37f8.tar.bz2
Merge "Switch DisplayListData to a staging model"
Diffstat (limited to 'core/java/android/widget')
-rw-r--r--core/java/android/widget/Editor.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 14e7951..b0a4e24 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -1338,7 +1338,6 @@ public class Editor {
layout.drawBackground(canvas, highlight, highlightPaint, cursorOffsetVertical,
firstLine, lastLine);
- final HardwareRenderer renderer = mTextView.getHardwareRenderer();
if (layout instanceof DynamicLayout) {
if (mTextDisplayLists == null) {
@@ -1402,7 +1401,7 @@ public class Editor {
// No need to untranslate, previous context is popped after
// drawDisplayList
} finally {
- blockDisplayList.end(renderer, hardwareCanvas);
+ blockDisplayList.end(hardwareCanvas);
// Same as drawDisplayList below, handled by our TextView's parent
blockDisplayList.setClipToBounds(false);
}