Automated g4 rollback of changelist 651422787

hunterstich · drchen · commit d3f2ca8c1f39 · 2024-08-05T04:28:19.000Z
PiperOrigin-RevId: 658415973
diff --git a/lib/java/com/google/android/material/textview/MaterialTextView.java b/lib/java/com/google/android/material/textview/MaterialTextView.java
@@ -123,7 +123,7 @@ public void setTextAppearance(@NonNull Context context, int resId) {
     if (canApplyLineHeight) {
       applyLineHeightFromViewAppearance(appearance);
     }
-    if (VERSION.SDK_INT >= VERSION_CODES.O) {
+    if (canForceRefreshFontVariationSettings) {
       maybeForceApplyFontVariationSettingsFromViewAppearance(appearance);
     }
     appearance.recycle();
@@ -150,7 +150,7 @@ private void initialize(@Nullable AttributeSet attrs, int defStyleAttr, int defS
     if (canApplyLineHeight) {
       applyLineHeightFromViewAppearance(appearance);
     }
-    if (VERSION.SDK_INT >= VERSION_CODES.O) {
+    if (canForceRefreshFontVariationSettings) {
       maybeForceApplyFontVariationSettingsFromViewAppearance(appearance);
     }
     appearance.recycle();

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public void setTextAppearance(@NonNull Context context, int resId) {`
`123`	`123`	`if (canApplyLineHeight) {`
`124`	`124`	`applyLineHeightFromViewAppearance(appearance);`
`125`	`125`	`}`
`126`		`- if (VERSION.SDK_INT >= VERSION_CODES.O) {`
	`126`	`+ if (canForceRefreshFontVariationSettings) {`
`127`	`127`	`maybeForceApplyFontVariationSettingsFromViewAppearance(appearance);`
`128`	`128`	`}`
`129`	`129`	`appearance.recycle();`
`@@ -150,7 +150,7 @@ private void initialize(@Nullable AttributeSet attrs, int defStyleAttr, int defS`
`150`	`150`	`if (canApplyLineHeight) {`
`151`	`151`	`applyLineHeightFromViewAppearance(appearance);`
`152`	`152`	`}`
`153`		`- if (VERSION.SDK_INT >= VERSION_CODES.O) {`
	`153`	`+ if (canForceRefreshFontVariationSettings) {`
`154`	`154`	`maybeForceApplyFontVariationSettingsFromViewAppearance(appearance);`
`155`	`155`	`}`
`156`	`156`	`appearance.recycle();`