Merge "TextLayoutCache - add glyphs caching"

1 files changed, 11 insertions, 4 deletions

diff --git a/tests/BiDiTests/src/com/android/bidi/BiDiTestView.java b/tests/BiDiTests/src/com/android/bidi/BiDiTestView.java
index cd415c2..f00bd06 100644
--- a/tests/BiDiTests/src/com/android/bidi/BiDiTestView.java
+++ b/tests/BiDiTests/src/com/android/bidi/BiDiTestView.java
@@ -150,11 +150,13 @@ public class BiDiTestView extends View {
         drawMetricsAroundText(canvas, x, y, textWidthHB, textWidthICU, textSize, Color.RED, Color.GREEN);
 
         paint.setColor(Color.WHITE);
-        char[] glyphs = new char[2*length];
-        int count = getGlyphs(text, glyphs, dir);
-
+//        char[] glyphs = new char[2*length];
+//        int count = getGlyphs(text, glyphs, dir);
+//
 //        logGlypths(glyphs, count);
-        drawTextWithDrawGlyph(canvas, glyphs, count, x, y + currentTextSize);
+//        drawTextWithDrawGlyph(canvas, glyphs, count, x, y + currentTextSize);
+
+        drawTextWithGlyphs(canvas, text, x, y + currentTextSize, dir);
 
         // Restore old paint properties
         paint.setFakeBoldText(oldFakeBold);
@@ -167,6 +169,11 @@ public class BiDiTestView extends View {
         canvas.drawGlyphs(glyphs, 0, count, x, y, paint);
     }
 
+    private void drawTextWithGlyphs(Canvas canvas, String text, int x, int y, int dir) {
+        paint.setBidiFlags(dir);
+        canvas.drawTextWithGlyphs(text, x, y, paint);
+    }
+
     private void logGlypths(char[] glyphs, int count) {
         Log.v(TAG, "GlyphIds - count=" + count);
         for (int n = 0; n < count; n++) {