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

Commit 2b20212e authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Hide Paint textLocale APIs - DO NOT MERGE" into jb-dev

parents c9c199a5 b0aa2f53

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -8614,7 +8614,6 @@ package android.graphics { 
    method public android.graphics.Paint.Align getTextAlign();

    method public void getTextBounds(java.lang.String, int, int, android.graphics.Rect);

    method public void getTextBounds(char[], int, int, android.graphics.Rect);

    method public java.util.Locale getTextLocale();

    method public void getTextPath(char[], int, int, float, float, android.graphics.Path);

    method public void getTextPath(java.lang.String, int, int, float, float, android.graphics.Path);

    method public float getTextScaleX();
@@ -8664,7 +8663,6 @@ package android.graphics { 
    method public void setStyle(android.graphics.Paint.Style);

    method public void setSubpixelText(boolean);

    method public void setTextAlign(android.graphics.Paint.Align);

    method public void setTextLocale(java.util.Locale);

    method public void setTextScaleX(float);

    method public void setTextSize(float);

    method public void setTextSkewX(float);

graphics/java/android/graphics/Paint.java

+2 −0
Original line number Diff line number Diff line
@@ -1055,6 +1055,7 @@ public class Paint { 
     * Get the text Locale.

     *

     * @return the paint's Locale used for drawing text, never null.

     * @hide

     */

    public Locale getTextLocale() {

        return mLocale;
@@ -1085,6 +1086,7 @@ public class Paint { 
     * job in certain ambiguous cases

     *

     * @param locale the paint's locale value for drawing text, must not be null.

     * @hide

     */

    public void setTextLocale(Locale locale) {

        if (locale == null) {