Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 318ca040 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Refactoring: Deprecate Paint.mNativeTypeface. 

Bug: 64269689
Test: m checkbuild
Test: bit CtsGraphicsTestCases:*
Test: bit CtsViewTestCases:*
Test: bit CtsTextTestCases:*
Change-Id: Idc9f2b4612741be949204cd06efc41e1738d6587
parent 3bf594f0

core/java/android/text/StaticLayout.java

+3 −4
Original line number Original line Diff line number Diff line
@@ -385,8 +385,7 @@ public class StaticLayout extends Layout { 




        /* package */ float addStyleRun(TextPaint paint, int start, int end, boolean isRtl) {

        /* package */ float addStyleRun(TextPaint paint, int start, int end, boolean isRtl) {

            setLocales(paint.getTextLocales());

            setLocales(paint.getTextLocales());

            return nAddStyleRun(mNativePtr, paint.getNativeInstance(), paint.mNativeTypeface,

            return nAddStyleRun(mNativePtr, paint.getNativeInstance(), start, end, isRtl);

                    start, end, isRtl);

        }

        }





        /* package */ void addMeasuredRun(int start, int end, float[] widths) {

        /* package */ void addMeasuredRun(int start, int end, float[] widths) {
@@ -1367,8 +1366,8 @@ public class StaticLayout extends Layout { 
            int[] variableTabStops, int defaultTabStop, int breakStrategy, int hyphenationFrequency,

            int[] variableTabStops, int defaultTabStop, int breakStrategy, int hyphenationFrequency,

            boolean isJustified);

            boolean isJustified);





    private static native float nAddStyleRun(long nativePtr, long nativePaint,

    private static native float nAddStyleRun(long nativePtr, long nativePaint, int start, int end,

            long nativeTypeface, int start, int end, boolean isRtl);

            boolean isRtl);





    private static native void nAddMeasuredRun(long nativePtr,

    private static native void nAddMeasuredRun(long nativePtr,

            int start, int end, float[] widths);

            int start, int end, float[] widths);

core/java/android/view/RecordingCanvas.java

+16 −19
Original line number Original line Diff line number Diff line
@@ -395,7 +395,7 @@ public class RecordingCanvas extends Canvas { 
            throw new IndexOutOfBoundsException();

            throw new IndexOutOfBoundsException();

        }

        }

        nDrawText(mNativeCanvasWrapper, text, index, count, x, y, paint.mBidiFlags,

        nDrawText(mNativeCanvasWrapper, text, index, count, x, y, paint.mBidiFlags,

                paint.getNativeInstance(), paint.mNativeTypeface);

                paint.getNativeInstance());

    }

    }





    @Override

    @Override
@@ -407,7 +407,7 @@ public class RecordingCanvas extends Canvas { 
        if (text instanceof String || text instanceof SpannedString

        if (text instanceof String || text instanceof SpannedString

                || text instanceof SpannableString) {

                || text instanceof SpannableString) {

            nDrawText(mNativeCanvasWrapper, text.toString(), start, end, x, y,

            nDrawText(mNativeCanvasWrapper, text.toString(), start, end, x, y,

                    paint.mBidiFlags, paint.getNativeInstance(), paint.mNativeTypeface);

                    paint.mBidiFlags, paint.getNativeInstance());

        } else if (text instanceof GraphicsOperations) {

        } else if (text instanceof GraphicsOperations) {

            ((GraphicsOperations) text).drawText(this, start, end, x, y,

            ((GraphicsOperations) text).drawText(this, start, end, x, y,

                    paint);

                    paint);
@@ -415,7 +415,7 @@ public class RecordingCanvas extends Canvas { 
            char[] buf = TemporaryBuffer.obtain(end - start);

            char[] buf = TemporaryBuffer.obtain(end - start);

            TextUtils.getChars(text, start, end, buf, 0);

            TextUtils.getChars(text, start, end, buf, 0);

            nDrawText(mNativeCanvasWrapper, buf, 0, end - start, x, y,

            nDrawText(mNativeCanvasWrapper, buf, 0, end - start, x, y,

                    paint.mBidiFlags, paint.getNativeInstance(), paint.mNativeTypeface);

                    paint.mBidiFlags, paint.getNativeInstance());

            TemporaryBuffer.recycle(buf);

            TemporaryBuffer.recycle(buf);

        }

        }

    }

    }
@@ -423,7 +423,7 @@ public class RecordingCanvas extends Canvas { 
    @Override

    @Override

    public final void drawText(@NonNull String text, float x, float y, @NonNull Paint paint) {

    public final void drawText(@NonNull String text, float x, float y, @NonNull Paint paint) {

        nDrawText(mNativeCanvasWrapper, text, 0, text.length(), x, y, paint.mBidiFlags,

        nDrawText(mNativeCanvasWrapper, text, 0, text.length(), x, y, paint.mBidiFlags,

                paint.getNativeInstance(), paint.mNativeTypeface);

                paint.getNativeInstance());

    }

    }





    @Override

    @Override
@@ -433,7 +433,7 @@ public class RecordingCanvas extends Canvas { 
            throw new IndexOutOfBoundsException();

            throw new IndexOutOfBoundsException();

        }

        }

        nDrawText(mNativeCanvasWrapper, text, start, end, x, y, paint.mBidiFlags,

        nDrawText(mNativeCanvasWrapper, text, start, end, x, y, paint.mBidiFlags,

                paint.getNativeInstance(), paint.mNativeTypeface);

                paint.getNativeInstance());

    }

    }





    @Override

    @Override
@@ -444,7 +444,7 @@ public class RecordingCanvas extends Canvas { 
        }

        }

        nDrawTextOnPath(mNativeCanvasWrapper, text, index, count,

        nDrawTextOnPath(mNativeCanvasWrapper, text, index, count,

                path.readOnlyNI(), hOffset, vOffset,

                path.readOnlyNI(), hOffset, vOffset,

                paint.mBidiFlags, paint.getNativeInstance(), paint.mNativeTypeface);

                paint.mBidiFlags, paint.getNativeInstance());

    }

    }





    @Override

    @Override
@@ -452,7 +452,7 @@ public class RecordingCanvas extends Canvas { 
            float vOffset, @NonNull Paint paint) {

            float vOffset, @NonNull Paint paint) {

        if (text.length() > 0) {

        if (text.length() > 0) {

            nDrawTextOnPath(mNativeCanvasWrapper, text, path.readOnlyNI(), hOffset, vOffset,

            nDrawTextOnPath(mNativeCanvasWrapper, text, path.readOnlyNI(), hOffset, vOffset,

                    paint.mBidiFlags, paint.getNativeInstance(), paint.mNativeTypeface);

                    paint.mBidiFlags, paint.getNativeInstance());

        }

        }

    }

    }
@@ -473,7 +473,7 @@ public class RecordingCanvas extends Canvas { 
        }

        }





        nDrawTextRun(mNativeCanvasWrapper, text, index, count, contextIndex, contextCount,

        nDrawTextRun(mNativeCanvasWrapper, text, index, count, contextIndex, contextCount,

                x, y, isRtl, paint.getNativeInstance(), paint.mNativeTypeface);

                x, y, isRtl, paint.getNativeInstance());

    }

    }





    @Override

    @Override
@@ -494,7 +494,7 @@ public class RecordingCanvas extends Canvas { 
        if (text instanceof String || text instanceof SpannedString

        if (text instanceof String || text instanceof SpannedString

                || text instanceof SpannableString) {

                || text instanceof SpannableString) {

            nDrawTextRun(mNativeCanvasWrapper, text.toString(), start, end, contextStart,

            nDrawTextRun(mNativeCanvasWrapper, text.toString(), start, end, contextStart,

                    contextEnd, x, y, isRtl, paint.getNativeInstance(), paint.mNativeTypeface);

                    contextEnd, x, y, isRtl, paint.getNativeInstance());

        } else if (text instanceof GraphicsOperations) {

        } else if (text instanceof GraphicsOperations) {

            ((GraphicsOperations) text).drawTextRun(this, start, end,

            ((GraphicsOperations) text).drawTextRun(this, start, end,

                    contextStart, contextEnd, x, y, isRtl, paint);

                    contextStart, contextEnd, x, y, isRtl, paint);
@@ -504,7 +504,7 @@ public class RecordingCanvas extends Canvas { 
            char[] buf = TemporaryBuffer.obtain(contextLen);

            char[] buf = TemporaryBuffer.obtain(contextLen);

            TextUtils.getChars(text, contextStart, contextEnd, buf, 0);

            TextUtils.getChars(text, contextStart, contextEnd, buf, 0);

            nDrawTextRun(mNativeCanvasWrapper, buf, start - contextStart, len,

            nDrawTextRun(mNativeCanvasWrapper, buf, start - contextStart, len,

                    0, contextLen, x, y, isRtl, paint.getNativeInstance(), paint.mNativeTypeface);

                    0, contextLen, x, y, isRtl, paint.getNativeInstance());

            TemporaryBuffer.recycle(buf);

            TemporaryBuffer.recycle(buf);

        }

        }

    }

    }
@@ -614,28 +614,25 @@ public class RecordingCanvas extends Canvas { 




    @FastNative

    @FastNative

    private static native void nDrawText(long nativeCanvas, char[] text, int index, int count,

    private static native void nDrawText(long nativeCanvas, char[] text, int index, int count,

            float x, float y, int flags, long nativePaint, long nativeTypeface);

            float x, float y, int flags, long nativePaint);





    @FastNative

    @FastNative

    private static native void nDrawText(long nativeCanvas, String text, int start, int end,

    private static native void nDrawText(long nativeCanvas, String text, int start, int end,

            float x, float y, int flags, long nativePaint, long nativeTypeface);

            float x, float y, int flags, long nativePaint);





    @FastNative

    @FastNative

    private static native void nDrawTextRun(long nativeCanvas, String text, int start, int end,

    private static native void nDrawTextRun(long nativeCanvas, String text, int start, int end,

            int contextStart, int contextEnd, float x, float y, boolean isRtl, long nativePaint,

            int contextStart, int contextEnd, float x, float y, boolean isRtl, long nativePaint);

            long nativeTypeface);





    @FastNative

    @FastNative

    private static native void nDrawTextRun(long nativeCanvas, char[] text, int start, int count,

    private static native void nDrawTextRun(long nativeCanvas, char[] text, int start, int count,

            int contextStart, int contextCount, float x, float y, boolean isRtl, long nativePaint,

            int contextStart, int contextCount, float x, float y, boolean isRtl, long nativePaint);

            long nativeTypeface);





    @FastNative

    @FastNative

    private static native void nDrawTextOnPath(long nativeCanvas, char[] text, int index, int count,

    private static native void nDrawTextOnPath(long nativeCanvas, char[] text, int index, int count,

            long nativePath, float hOffset, float vOffset, int bidiFlags, long nativePaint,

            long nativePath, float hOffset, float vOffset, int bidiFlags, long nativePaint);

            long nativeTypeface);





    @FastNative

    @FastNative

    private static native void nDrawTextOnPath(long nativeCanvas, String text, long nativePath,

    private static native void nDrawTextOnPath(long nativeCanvas, String text, long nativePath,

            float hOffset, float vOffset, int flags, long nativePaint, long nativeTypeface);

            float hOffset, float vOffset, int flags, long nativePaint);

}
 
}