summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/etc/com.android.systemui.xml1
-rw-r--r--data/fonts/Android.bp10
-rw-r--r--data/fonts/fonts.xml132
3 files changed, 115 insertions, 28 deletions
diff --git a/data/etc/com.android.systemui.xml b/data/etc/com.android.systemui.xml
index f2a33de008d6..437ad2fa035e 100644
--- a/data/etc/com.android.systemui.xml
+++ b/data/etc/com.android.systemui.xml
@@ -60,6 +60,7 @@
<permission name="android.permission.UPDATE_APP_OPS_STATS"/>
<permission name="android.permission.USE_RESERVED_DISK"/>
<permission name="android.permission.WATCH_APPOPS"/>
+ <permission name="android.permission.WRITE_APN_SETTINGS"/>
<permission name="android.permission.WRITE_DREAM_STATE"/>
<permission name="android.permission.WRITE_MEDIA_STORAGE"/>
<permission name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
diff --git a/data/fonts/Android.bp b/data/fonts/Android.bp
index f90a74d939f4..81716878df3a 100644
--- a/data/fonts/Android.bp
+++ b/data/fonts/Android.bp
@@ -30,16 +30,6 @@ license {
}
prebuilt_font {
- name: "DroidSansMono.ttf",
- src: "DroidSansMono.ttf",
- required: [
- // Roboto-Regular.ttf provides DroidSans.ttf as a symlink to itself
- // Roboto-Regular.ttf provides DroidSans-Bold.ttf as a symlink to itself
- "Roboto-Regular.ttf",
- ],
-}
-
-prebuilt_font {
name: "AndroidClock.ttf",
src: "AndroidClock.ttf",
}
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml
index 4ae0fc4ae6ed..e91e3338c555 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -25,88 +25,92 @@
<!-- first font is default -->
<family name="sans-serif">
<font weight="100" style="normal">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="0" />
+ <axis tag="slnt" stylevalue="0" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="100" />
</font>
<font weight="200" style="normal">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="0" />
+ <axis tag="slnt" stylevalue="0" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="200" />
</font>
<font weight="300" style="normal">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="0" />
+ <axis tag="slnt" stylevalue="0" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="300" />
</font>
- <font weight="400" style="normal">RobotoStatic-Regular.ttf</font>
+ <font weight="400" style="normal">Roboto-Regular.ttf
+ <axis tag="slnt" stylevalue="0" />
+ <axis tag="wdth" stylevalue="100" />
+ <axis tag="wght" stylevalue="400" />
+ </font>
<font weight="500" style="normal">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="0" />
+ <axis tag="slnt" stylevalue="0" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="500" />
</font>
<font weight="600" style="normal">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="0" />
+ <axis tag="slnt" stylevalue="0" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="600" />
</font>
<font weight="700" style="normal">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="0" />
+ <axis tag="slnt" stylevalue="0" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="700" />
</font>
<font weight="800" style="normal">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="0" />
+ <axis tag="slnt" stylevalue="0" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="800" />
</font>
<font weight="900" style="normal">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="0" />
+ <axis tag="slnt" stylevalue="0" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="900" />
</font>
<font weight="100" style="italic">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="1" />
+ <axis tag="slnt" stylevalue="-10" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="100" />
</font>
<font weight="200" style="italic">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="1" />
+ <axis tag="slnt" stylevalue="-10" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="200" />
</font>
<font weight="300" style="italic">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="1" />
+ <axis tag="slnt" stylevalue="-10" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="300" />
</font>
<font weight="400" style="italic">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="1" />
+ <axis tag="slnt" stylevalue="-10" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="400" />
</font>
<font weight="500" style="italic">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="1" />
+ <axis tag="slnt" stylevalue="-10" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="500" />
</font>
<font weight="600" style="italic">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="1" />
+ <axis tag="slnt" stylevalue="-10" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="600" />
</font>
<font weight="700" style="italic">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="1" />
+ <axis tag="slnt" stylevalue="-10" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="700" />
</font>
<font weight="800" style="italic">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="1" />
+ <axis tag="slnt" stylevalue="-10" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="800" />
</font>
<font weight="900" style="italic">Roboto-Regular.ttf
- <axis tag="ital" stylevalue="1" />
+ <axis tag="slnt" stylevalue="-10" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="900" />
</font>
@@ -271,6 +275,98 @@
<alias name="source-sans-pro-semi-bold" to="source-sans-pro" weight="600"/>
<!-- fallback fonts -->
+ <family>
+ <font weight="100" style="normal">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="0"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="100"/>
+ </font>
+ <font weight="100" style="italic">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="1"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="100"/>
+ </font>
+ <font weight="200" style="normal">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="0"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="200"/>
+ </font>
+ <font weight="200" style="italic">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="1"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="200"/>
+ </font>
+ <font weight="300" style="normal">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="0"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="300"/>
+ </font>
+ <font weight="300" style="italic">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="1"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="300"/>
+ </font>
+ <font weight="400" style="normal">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="0"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="400"/>
+ </font>
+ <font weight="400" style="italic">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="1"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="400"/>
+ </font>
+ <font weight="500" style="normal">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="0"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="500"/>
+ </font>
+ <font weight="500" style="italic">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="1"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="500"/>
+ </font>
+ <font weight="600" style="normal">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="0"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="600"/>
+ </font>
+ <font weight="600" style="italic">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="1"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="600"/>
+ </font>
+ <font weight="700" style="normal">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="0"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="700"/>
+ </font>
+ <font weight="700" style="italic">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="1"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="700"/>
+ </font>
+ <font weight="800" style="normal">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="0"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="800"/>
+ </font>
+ <font weight="800" style="italic">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="1"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="800"/>
+ </font>
+ <font weight="900" style="normal">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="0"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="900"/>
+ </font>
+ <font weight="900" style="italic">RobotoFallback-VF.ttf
+ <axis tag="ital" stylevalue="1"/>
+ <axis tag="wdth" stylevalue="100"/>
+ <axis tag="wght" stylevalue="900"/>
+ </font>
+ </family>
<family lang="und-Arab" variant="elegant">
<font weight="400" style="normal" postScriptName="NotoNaskhArabic">
NotoNaskhArabic-Regular.ttf