diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml index caaba6d9b42..e9897ec2d06 100644 --- a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml +++ b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml @@ -160,6 +160,14 @@ @style/TextAppearance.Material3.LabelMedium @style/TextAppearance.Material3.LabelSmall + + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceBodyMedium + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceBodyMedium + ?attr/textAppearanceBodyLarge ?attr/textAppearanceBodyLarge @@ -338,6 +346,14 @@ @style/TextAppearance.Material3.LabelMedium @style/TextAppearance.Material3.LabelSmall + + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceBodyMedium + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceBodyMedium + ?attr/textAppearanceBodyLarge ?attr/textAppearanceBodyLarge diff --git a/lib/java/com/google/android/material/theme/res/values/themes_base.xml b/lib/java/com/google/android/material/theme/res/values/themes_base.xml index fe9a4de5606..f019ca7bdfd 100644 --- a/lib/java/com/google/android/material/theme/res/values/themes_base.xml +++ b/lib/java/com/google/android/material/theme/res/values/themes_base.xml @@ -171,6 +171,14 @@ @style/TextAppearance.Material3.LabelMedium @style/TextAppearance.Material3.LabelSmall + + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceBodyMedium + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceBodyMedium + ?attr/textAppearanceBodyLarge ?attr/textAppearanceBodyLarge @@ -356,6 +364,14 @@ @style/TextAppearance.Material3.LabelMedium @style/TextAppearance.Material3.LabelSmall + + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceBodyMedium + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceTitleMedium + ?attr/textAppearanceBodyMedium + ?attr/textAppearanceBodyLarge ?attr/textAppearanceBodyLarge diff --git a/lib/javatests/com/google/android/material/theme/ThemeTest.java b/lib/javatests/com/google/android/material/theme/ThemeTest.java index 4fae7e953c0..786fe1dbba8 100644 --- a/lib/javatests/com/google/android/material/theme/ThemeTest.java +++ b/lib/javatests/com/google/android/material/theme/ThemeTest.java @@ -18,6 +18,7 @@ import com.google.android.material.R; +import static android.os.Build.VERSION_CODES.LOLLIPOP; import static androidx.test.core.app.ApplicationProvider.getApplicationContext; import static com.google.common.truth.Truth.assertThat; @@ -35,10 +36,12 @@ import org.robolectric.ParameterizedRobolectricTestRunner; import org.robolectric.ParameterizedRobolectricTestRunner.Parameter; import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; +import org.robolectric.annotation.Config; import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for the Material themes. */ @RunWith(ParameterizedRobolectricTestRunner.class) +@Config(sdk = LOLLIPOP) @DoNotInstrument public class ThemeTest { @@ -86,7 +89,7 @@ public class ThemeTest { new int[] {R.attr.colorOnPrimarySurface, R.attr.colorOnSurface}); /** - * These are color attribtues that all themes, including bridge themes, should have. + * These are color attributes that all themes, including bridge themes, should have. * *

All Light themes should match {@code Theme.MaterialComponents.Light} and all Dark themes * should match {@code Theme.MaterialComponents}. @@ -120,7 +123,7 @@ public class ThemeTest { R.attr.colorError); /** - * There are color attribtues that all theme overlays should have. + * There are color attributes that all theme overlays should have. * *

All Light theme overlays shold match {@code Theme.MaterialComponents.Light} and all Dark * theme overlays should match {@code Theme.MaterialComponents}. @@ -316,7 +319,13 @@ public class ThemeTest { android.R.attr.textAppearanceMedium, android.R.attr.textAppearanceMediumInverse, android.R.attr.textAppearanceSmall, - android.R.attr.textAppearanceSmallInverse); + android.R.attr.textAppearanceSmallInverse, + android.R.attr.textAppearanceListItem, + android.R.attr.textAppearanceListItemSmall, + android.R.attr.textAppearanceListItemSecondary, + R.attr.textAppearanceListItem, + R.attr.textAppearanceListItemSmall, + R.attr.textAppearanceListItemSecondary); /** These are typography styles that should be the same for *all* M3 full themes. */ private static final ImmutableList M3_FULL_TYPOGRAPHY_ATTRIBUTES =