Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make Typeface member final" into sc-dev

Browse Source
This commit is contained in:
Seigo Nonaka
2021-02-26 06:00:42 +00:00
committed by Android (Google) Code Review
parent fb6ea1e786 4560edffbe
commit 8ae6cd8c72
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/java/android/graphics/Typeface.java
View File

@@ -174,7 +174,7 @@ public class Typeface {
@UnsupportedAppUsage @UnsupportedAppUsage
public final long native_instance; public final long native_instance;
private Runnable mCleaner; private final Runnable mCleaner;
/** @hide */ /** @hide */
@IntDef(value = {NORMAL, BOLD, ITALIC, BOLD_ITALIC}) @IntDef(value = {NORMAL, BOLD, ITALIC, BOLD_ITALIC})
@@ -189,9 +189,9 @@ public class Typeface {
/** @hide */ public static final int STYLE_MASK = 0x03; /** @hide */ public static final int STYLE_MASK = 0x03;
@UnsupportedAppUsage @UnsupportedAppUsage
private @Style int mStyle = 0; private @Style final int mStyle;
private @IntRange(from = 0, to = FontStyle.FONT_WEIGHT_MAX) int mWeight = 0; private @IntRange(from = 0, to = FontStyle.FONT_WEIGHT_MAX) final int mWeight;
// Value for weight and italic. Indicates the value is resolved by font metadata. // Value for weight and italic. Indicates the value is resolved by font metadata.
// Must be the same as the C++ constant in core/jni/android/graphics/FontFamily.cpp // Must be the same as the C++ constant in core/jni/android/graphics/FontFamily.cpp