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

Commit e039c5f5 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by android-build-merger
Browse files

Merge "Unhide getWeight of Typeface" into pi-dev 

am: 1b8333d1

Change-Id: I7710bd3bc88dd8e88fb178af02b85195a7cb95c4
parents 9b8e53d4 1b8333d1

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -14436,6 +14436,7 @@ package android.graphics { 
    method public static android.graphics.Typeface createFromFile(java.lang.String);

    method public static android.graphics.Typeface defaultFromStyle(int);

    method public int getStyle();

    method public int getWeight();

    method public final boolean isBold();

    method public final boolean isItalic();

    field public static final int BOLD = 1; // 0x1

graphics/java/android/graphics/Typeface.java

+2 −4
Original line number Diff line number Diff line
@@ -167,10 +167,8 @@ public class Typeface { 
        nativeSetDefault(t.native_instance);

    }



    // TODO: Make this public API. (b/64852739)

    /** @hide */

    @VisibleForTesting

    public int getWeight() {

    /** Returns the typeface's weight value */

    public @IntRange(from = 0, to = 1000) int getWeight() {

        return mWeight;

    }