summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2012-01-17 14:54:45 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-17 14:54:45 -0800
commit11d06a73df371be0b11d5cf586e24601d796c048 (patch)
tree8fcb9f12a52c0d289e9b359f7debc448823ecf1c /graphics
parent7c0f2824f2f95c28b00d2581760fc7098beaa4e1 (diff)
parent62b6eaa7f3a8111311a7ee097f278eb55865a499 (diff)
downloadframeworks_base-11d06a73df371be0b11d5cf586e24601d796c048.zip
frameworks_base-11d06a73df371be0b11d5cf586e24601d796c048.tar.gz
frameworks_base-11d06a73df371be0b11d5cf586e24601d796c048.tar.bz2
Merge "Fix text encoding when drawing with drawPosText in software"
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/Canvas.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java
index e1c73fd..5cac42a 100644
--- a/graphics/java/android/graphics/Canvas.java
+++ b/graphics/java/android/graphics/Canvas.java
@@ -1516,6 +1516,9 @@ public class Canvas {
/**
* Draw the text in the array, with each character's origin specified by
* the pos array.
+ *
+ * This method does not support glyph composition and decomposition and
+ * should therefore not be used to render complex scripts.
*
* @param text The text to be drawn
* @param index The index of the first character to draw
@@ -1536,6 +1539,9 @@ public class Canvas {
/**
* Draw the text in the array, with each character's origin specified by
* the pos array.
+ *
+ * This method does not support glyph composition and decomposition and
+ * should therefore not be used to render complex scripts.
*
* @param text The text to be drawn
* @param pos Array of [x,y] positions, used to position each character