Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: Ibc9cd1a306fe984bd7687453fe895b3946bea5e4
Change-Id: Ia04982e07186a7d15110feee497b0b481fb88200
diff --git a/plugins/src/main/java/org/robolectric/android/plugins/AndroidConfigConfigurer.java b/plugins/src/main/java/org/robolectric/android/plugins/AndroidConfigConfigurer.java
new file mode 100644
index 0000000..aa296c7
--- /dev/null
+++ b/plugins/src/main/java/org/robolectric/android/plugins/AndroidConfigConfigurer.java
@@ -0,0 +1,30 @@
+package org.robolectric.android.plugins;
+
+import com.google.auto.service.AutoService;
+
+import org.robolectric.pluginapi.config.Configurer;
+import org.robolectric.pluginapi.config.GlobalConfigProvider;
+import org.robolectric.plugins.ConfigConfigurer;
+import org.robolectric.plugins.PackagePropertiesLoader;
+import org.robolectric.util.Logger;
+import org.robolectric.util.inject.Supercedes;
+
+@AutoService(Configurer.class)
+@Supercedes(ConfigConfigurer.class)
+public class AndroidConfigConfigurer extends ConfigConfigurer {
+
+ static {
+ System.setProperty("robolectric.logging.enabled", "true");
+ Logger.info("Logging turned on by AndroidConfigConfigurer.class");
+ }
+
+ protected AndroidConfigConfigurer(
+ PackagePropertiesLoader packagePropertiesLoader) {
+ super(packagePropertiesLoader);
+ }
+
+ public AndroidConfigConfigurer(PackagePropertiesLoader packagePropertiesLoader,
+ GlobalConfigProvider defaultConfigProvider) {
+ super(packagePropertiesLoader, defaultConfigProvider);
+ }
+}
\ No newline at end of file
diff --git a/resources/fonts/GoogleSans-Italic.ttf b/resources/fonts/GoogleSans-Italic.ttf
new file mode 100644
index 0000000..b6e8079
--- /dev/null
+++ b/resources/fonts/GoogleSans-Italic.ttf
Binary files differ
diff --git a/resources/fonts/GoogleSans-Regular.ttf b/resources/fonts/GoogleSans-Regular.ttf
new file mode 100644
index 0000000..4e97ca9
--- /dev/null
+++ b/resources/fonts/GoogleSans-Regular.ttf
Binary files differ
diff --git a/resources/fonts/GoogleSansClock-Regular.ttf b/resources/fonts/GoogleSansClock-Regular.ttf
new file mode 100644
index 0000000..5e683a0
--- /dev/null
+++ b/resources/fonts/GoogleSansClock-Regular.ttf
Binary files differ
diff --git a/resources/fonts/GoogleSansFlex-Regular.ttf b/resources/fonts/GoogleSansFlex-Regular.ttf
new file mode 100644
index 0000000..f6dae39
--- /dev/null
+++ b/resources/fonts/GoogleSansFlex-Regular.ttf
Binary files differ
diff --git a/resources/fonts/fonts.xml b/resources/fonts/fonts.xml
index 8e2a59c..354bd24 100644
--- a/resources/fonts/fonts.xml
+++ b/resources/fonts/fonts.xml
@@ -1542,4 +1542,179 @@
<axis tag="wght" stylevalue="700"/>
</font>
</family>
+ <family customizationType="new-named-family" name="google-sans">
+ <font weight="400" style="normal">GoogleSans-Regular.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="18.0"/>
+ <axis tag="wght" stylevalue="400"/>
+ </font>
+ <font weight="500" style="normal">GoogleSans-Regular.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="18.0"/>
+ <axis tag="wght" stylevalue="500"/>
+ </font>
+ <font weight="600" style="normal">GoogleSans-Regular.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="18.0"/>
+ <axis tag="wght" stylevalue="600"/>
+ </font>
+ <font weight="700" style="normal">GoogleSans-Regular.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="18.0"/>
+ <axis tag="wght" stylevalue="700"/>
+ </font>
+ <font weight="400" style="italic">GoogleSans-Italic.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="18.0"/>
+ <axis tag="wght" stylevalue="400"/>
+ </font>
+ <font weight="500" style="italic">GoogleSans-Italic.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="18.0"/>
+ <axis tag="wght" stylevalue="500"/>
+ </font>
+ <font weight="600" style="italic">GoogleSans-Italic.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="18.0"/>
+ <axis tag="wght" stylevalue="600"/>
+ </font>
+ <font weight="700" style="italic">GoogleSans-Italic.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="18.0"/>
+ <axis tag="wght" stylevalue="700"/>
+ </font>
+ </family>
+
+ <family customizationType="new-named-family" name="google-sans-flex">
+ <font weight="100" style="normal">GoogleSansFlex-Regular.ttf
+ <axis tag="wght" stylevalue="100"/>
+ </font>
+ <font weight="200" style="normal">GoogleSansFlex-Regular.ttf
+ <axis tag="wght" stylevalue="200"/>
+ </font>
+ <font weight="300" style="normal">GoogleSansFlex-Regular.ttf
+ <axis tag="wght" stylevalue="300"/>
+ </font>
+ <font weight="400" style="normal">GoogleSansFlex-Regular.ttf
+ <axis tag="wght" stylevalue="400"/>
+ </font>
+ <font weight="500" style="normal">GoogleSansFlex-Regular.ttf
+ <axis tag="wght" stylevalue="500"/>
+ </font>
+ <font weight="600" style="normal">GoogleSansFlex-Regular.ttf
+ <axis tag="wght" stylevalue="600"/>
+ </font>
+ <font weight="700" style="normal">GoogleSansFlex-Regular.ttf
+ <axis tag="wght" stylevalue="700"/>
+ </font>
+ <font weight="800" style="normal">GoogleSansFlex-Regular.ttf
+ <axis tag="wght" stylevalue="800"/>
+ </font>
+ <font weight="900" style="normal">GoogleSansFlex-Regular.ttf
+ <axis tag="wght" stylevalue="900"/>
+ </font>
+ </family>
+
+ <family customizationType="new-named-family" name="google-sans-medium">
+ <font weight="500" style="normal">GoogleSans-Regular.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="18.0"/>
+ <axis tag="wght" stylevalue="500"/>
+ </font>
+ </family>
+
+ <family customizationType="new-named-family" name="google-sans-clock">
+ <font>GoogleSansClock-Regular.ttf</font>
+ </family>
+
+ <family customizationType="new-named-family" name="google-sans-bold">
+ <font weight="700" style="normal">GoogleSans-Regular.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="18.0"/>
+ <axis tag="wght" stylevalue="700"/>
+ </font>
+ </family>
+
+ <family customizationType="new-named-family" name="google-sans-text">
+ <font weight="400" style="normal">GoogleSans-Regular.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="17.0"/>
+ <axis tag="wght" stylevalue="400"/>
+ </font>
+ <font weight="500" style="normal">GoogleSans-Regular.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="17.0"/>
+ <axis tag="wght" stylevalue="500"/>
+ </font>
+ <font weight="600" style="normal">GoogleSans-Regular.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="17.0"/>
+ <axis tag="wght" stylevalue="600"/>
+ </font>
+ <font weight="700" style="normal">GoogleSans-Regular.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="17.0"/>
+ <axis tag="wght" stylevalue="700"/>
+ </font>
+ <font weight="400" style="italic">GoogleSans-Italic.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="17.0"/>
+ <axis tag="wght" stylevalue="400"/>
+ </font>
+ <font weight="500" style="italic">GoogleSans-Italic.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="17.0"/>
+ <axis tag="wght" stylevalue="500"/>
+ </font>
+ <font weight="600" style="italic">GoogleSans-Italic.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="17.0"/>
+ <axis tag="wght" stylevalue="600"/>
+ </font>
+ <font weight="700" style="italic">GoogleSans-Italic.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="17.0"/>
+ <axis tag="wght" stylevalue="700"/>
+ </font>
+ </family>
+
+ <family customizationType="new-named-family" name="google-sans-text-medium">
+ <font weight="500" style="normal">GoogleSans-Regular.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="17.0"/>
+ <axis tag="wght" stylevalue="500"/>
+ </font>
+ </family>
+
+ <family customizationType="new-named-family" name="google-sans-text-bold">
+ <font weight="700" style="normal">GoogleSans-Regular.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="17.0"/>
+ <axis tag="wght" stylevalue="700"/>
+ </font>
+ </family>
+
+ <family customizationType="new-named-family" name="google-sans-text-italic">
+ <font weight="400" style="italic">GoogleSans-Italic.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="17.0"/>
+ <axis tag="wght" stylevalue="400"/>
+ </font>
+ </family>
+
+ <family customizationType="new-named-family" name="google-sans-text-medium-italic">
+ <font weight="500" style="italic">GoogleSans-Italic.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="17.0"/>
+ <axis tag="wght" stylevalue="500"/>
+ </font>
+ </family>
+
+ <family customizationType="new-named-family" name="google-sans-text-bold-italic">
+ <font weight="700" style="italic">GoogleSans-Italic.ttf
+ <axis tag="GRAD" stylevalue="0"/>
+ <axis tag="opsz" stylevalue="17.0"/>
+ <axis tag="wght" stylevalue="700"/>
+ </font>
+ </family>
</familyset>
