summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorSally Yuen <sallyyuen@google.com>2020-11-16 16:55:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-11-16 16:55:48 +0000
commit67bf1480cfa330cadef485a05146fd6a0997924d (patch)
tree3d3db38359e608271be482b156a3aedb3506f12b /api
parent474cac5066c76fa9d9e387911d596298ae1c9a04 (diff)
parentb2ebd0d535251e1d7cf491bea1c221161b3682ff (diff)
Merge "Change forceBoldText to fontWeightAdjustment in Configuration"
Diffstat (limited to 'api')
-rw-r--r--api/current.txt8
1 files changed, 3 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt
index e24df4204af4..1a0db282396b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11408,7 +11408,7 @@ package android.content.pm {
field public static final int CONFIG_COLOR_MODE = 16384; // 0x4000
field public static final int CONFIG_DENSITY = 4096; // 0x1000
field public static final int CONFIG_FONT_SCALE = 1073741824; // 0x40000000
- field public static final int CONFIG_FORCE_BOLD_TEXT = 268435456; // 0x10000000
+ field public static final int CONFIG_FONT_WEIGHT_ADJUSTMENT = 268435456; // 0x10000000
field public static final int CONFIG_KEYBOARD = 16; // 0x10
field public static final int CONFIG_KEYBOARD_HIDDEN = 32; // 0x20
field public static final int CONFIG_LAYOUT_DIRECTION = 8192; // 0x2000
@@ -12736,9 +12736,7 @@ package android.content.res {
field public static final int COLOR_MODE_WIDE_COLOR_GAMUT_YES = 2; // 0x2
field @NonNull public static final android.os.Parcelable.Creator<android.content.res.Configuration> CREATOR;
field public static final int DENSITY_DPI_UNDEFINED = 0; // 0x0
- field public static final int FORCE_BOLD_TEXT_NO = 1; // 0x1
- field public static final int FORCE_BOLD_TEXT_UNDEFINED = 0; // 0x0
- field public static final int FORCE_BOLD_TEXT_YES = 2; // 0x2
+ field public static final int FONT_WEIGHT_ADJUSTMENT_UNDEFINED = 2147483647; // 0x7fffffff
field public static final int HARDKEYBOARDHIDDEN_NO = 1; // 0x1
field public static final int HARDKEYBOARDHIDDEN_UNDEFINED = 0; // 0x0
field public static final int HARDKEYBOARDHIDDEN_YES = 2; // 0x2
@@ -12805,7 +12803,7 @@ package android.content.res {
field public int colorMode;
field public int densityDpi;
field public float fontScale;
- field public int forceBoldText;
+ field public int fontWeightAdjustment;
field public int hardKeyboardHidden;
field public int keyboard;
field public int keyboardHidden;