diff options
Diffstat (limited to 'data')
23 files changed, 87 insertions, 64 deletions
diff --git a/data/etc/platform.xml b/data/etc/platform.xml index 6659769..c517201 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -58,11 +58,11 @@ <group gid="log" /> </permission> - <permission name="android.permission.READ_EXTERNAL_STORAGE" > + <permission name="android.permission.READ_EXTERNAL_STORAGE" perUser="true" > <group gid="sdcard_r" /> </permission> - <permission name="android.permission.WRITE_EXTERNAL_STORAGE" > + <permission name="android.permission.WRITE_EXTERNAL_STORAGE" perUser="true" > <group gid="sdcard_r" /> <group gid="sdcard_rw" /> </permission> diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 80fb1fd..a0b26f3 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -49,6 +49,8 @@ extra_font_files := \ ################################ # Do not include Motoya on space-constrained devices ifneq ($(SMALLER_FONT_FOOTPRINT),true) +# Do not include Motoya if we are including full NotoSans +ifneq ($(FONT_NOTOSANS_FULL),true) include $(CLEAR_VARS) LOCAL_MODULE := MTLmr3m.ttf @@ -59,6 +61,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts include $(BUILD_PREBUILT) extra_font_files += MTLmr3m.ttf +endif # !FONT_NOTOSANS_FULL endif # !SMALLER_FONT_FOOTPRINT ################################ @@ -111,49 +114,11 @@ $(eval include $(BUILD_PREBUILT)) endef font_src_files := \ - Roboto-Regular.ttf \ - Roboto-Bold.ttf \ - Roboto-Italic.ttf \ - Roboto-BoldItalic.ttf \ Clockopia.ttf \ AndroidClock.ttf \ AndroidClock_Highlight.ttf \ AndroidClock_Solid.ttf -ifeq ($(MINIMAL_FONT_FOOTPRINT),true) - -$(eval $(call create-font-symlink,Roboto-Black.ttf,Roboto-Bold.ttf)) -$(eval $(call create-font-symlink,Roboto-BlackItalic.ttf,Roboto-BoldItalic.ttf)) -$(eval $(call create-font-symlink,Roboto-Light.ttf,Roboto-Regular.ttf)) -$(eval $(call create-font-symlink,Roboto-LightItalic.ttf,Roboto-Italic.ttf)) -$(eval $(call create-font-symlink,Roboto-Medium.ttf,Roboto-Regular.ttf)) -$(eval $(call create-font-symlink,Roboto-MediumItalic.ttf,Roboto-Italic.ttf)) -$(eval $(call create-font-symlink,Roboto-Thin.ttf,Roboto-Regular.ttf)) -$(eval $(call create-font-symlink,Roboto-ThinItalic.ttf,Roboto-Italic.ttf)) -$(eval $(call create-font-symlink,RobotoCondensed-Regular.ttf,Roboto-Regular.ttf)) -$(eval $(call create-font-symlink,RobotoCondensed-Bold.ttf,Roboto-Bold.ttf)) -$(eval $(call create-font-symlink,RobotoCondensed-Italic.ttf,Roboto-Italic.ttf)) -$(eval $(call create-font-symlink,RobotoCondensed-BoldItalic.ttf,Roboto-BoldItalic.ttf)) - -else # !MINIMAL_FONT -font_src_files += \ - Roboto-Black.ttf \ - Roboto-BlackItalic.ttf \ - Roboto-Light.ttf \ - Roboto-LightItalic.ttf \ - Roboto-Medium.ttf \ - Roboto-MediumItalic.ttf \ - Roboto-Thin.ttf \ - Roboto-ThinItalic.ttf \ - RobotoCondensed-Regular.ttf \ - RobotoCondensed-Bold.ttf \ - RobotoCondensed-Italic.ttf \ - RobotoCondensed-BoldItalic.ttf \ - RobotoCondensed-Light.ttf \ - RobotoCondensed-LightItalic.ttf - -endif # !MINIMAL_FONT - $(foreach f, $(font_src_files), $(call build-one-font-module, $(f))) build-one-font-module := diff --git a/data/fonts/Roboto-Black.ttf b/data/fonts/Roboto-Black.ttf Binary files differdeleted file mode 100644 index 79b5f74..0000000 --- a/data/fonts/Roboto-Black.ttf +++ /dev/null diff --git a/data/fonts/Roboto-BlackItalic.ttf b/data/fonts/Roboto-BlackItalic.ttf Binary files differdeleted file mode 100644 index 4c58b7b..0000000 --- a/data/fonts/Roboto-BlackItalic.ttf +++ /dev/null diff --git a/data/fonts/Roboto-Bold.ttf b/data/fonts/Roboto-Bold.ttf Binary files differdeleted file mode 100644 index 58397cc..0000000 --- a/data/fonts/Roboto-Bold.ttf +++ /dev/null diff --git a/data/fonts/Roboto-BoldItalic.ttf b/data/fonts/Roboto-BoldItalic.ttf Binary files differdeleted file mode 100644 index 606252c..0000000 --- a/data/fonts/Roboto-BoldItalic.ttf +++ /dev/null diff --git a/data/fonts/Roboto-Italic.ttf b/data/fonts/Roboto-Italic.ttf Binary files differdeleted file mode 100644 index cc3fd40..0000000 --- a/data/fonts/Roboto-Italic.ttf +++ /dev/null diff --git a/data/fonts/Roboto-Light.ttf b/data/fonts/Roboto-Light.ttf Binary files differdeleted file mode 100644 index e65c2d2..0000000 --- a/data/fonts/Roboto-Light.ttf +++ /dev/null diff --git a/data/fonts/Roboto-LightItalic.ttf b/data/fonts/Roboto-LightItalic.ttf Binary files differdeleted file mode 100644 index d5476e7..0000000 --- a/data/fonts/Roboto-LightItalic.ttf +++ /dev/null diff --git a/data/fonts/Roboto-Medium.ttf b/data/fonts/Roboto-Medium.ttf Binary files differdeleted file mode 100644 index 9263090..0000000 --- a/data/fonts/Roboto-Medium.ttf +++ /dev/null diff --git a/data/fonts/Roboto-MediumItalic.ttf b/data/fonts/Roboto-MediumItalic.ttf Binary files differdeleted file mode 100644 index 329aab9..0000000 --- a/data/fonts/Roboto-MediumItalic.ttf +++ /dev/null diff --git a/data/fonts/Roboto-Regular.ttf b/data/fonts/Roboto-Regular.ttf Binary files differdeleted file mode 100644 index c515eca..0000000 --- a/data/fonts/Roboto-Regular.ttf +++ /dev/null diff --git a/data/fonts/Roboto-Thin.ttf b/data/fonts/Roboto-Thin.ttf Binary files differdeleted file mode 100644 index 35ab525..0000000 --- a/data/fonts/Roboto-Thin.ttf +++ /dev/null diff --git a/data/fonts/Roboto-ThinItalic.ttf b/data/fonts/Roboto-ThinItalic.ttf Binary files differdeleted file mode 100644 index edada2e..0000000 --- a/data/fonts/Roboto-ThinItalic.ttf +++ /dev/null diff --git a/data/fonts/RobotoCondensed-Bold.ttf b/data/fonts/RobotoCondensed-Bold.ttf Binary files differdeleted file mode 100644 index bcbeece..0000000 --- a/data/fonts/RobotoCondensed-Bold.ttf +++ /dev/null diff --git a/data/fonts/RobotoCondensed-BoldItalic.ttf b/data/fonts/RobotoCondensed-BoldItalic.ttf Binary files differdeleted file mode 100644 index 7680d0a..0000000 --- a/data/fonts/RobotoCondensed-BoldItalic.ttf +++ /dev/null diff --git a/data/fonts/RobotoCondensed-Italic.ttf b/data/fonts/RobotoCondensed-Italic.ttf Binary files differdeleted file mode 100644 index 04c83a0..0000000 --- a/data/fonts/RobotoCondensed-Italic.ttf +++ /dev/null diff --git a/data/fonts/RobotoCondensed-Light.ttf b/data/fonts/RobotoCondensed-Light.ttf Binary files differdeleted file mode 100644 index 9f57418..0000000 --- a/data/fonts/RobotoCondensed-Light.ttf +++ /dev/null diff --git a/data/fonts/RobotoCondensed-LightItalic.ttf b/data/fonts/RobotoCondensed-LightItalic.ttf Binary files differdeleted file mode 100644 index f9eac04..0000000 --- a/data/fonts/RobotoCondensed-LightItalic.ttf +++ /dev/null diff --git a/data/fonts/RobotoCondensed-Regular.ttf b/data/fonts/RobotoCondensed-Regular.ttf Binary files differdeleted file mode 100644 index 3a06286..0000000 --- a/data/fonts/RobotoCondensed-Regular.ttf +++ /dev/null diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index 42b5d5d..dc364a12 100644 --- a/data/fonts/fallback_fonts.xml +++ b/data/fonts/fallback_fonts.xml @@ -181,6 +181,18 @@ </family> <family> <fileset> + <file variant="elegant">NotoSansOriya-Regular.ttf</file> + <file variant="elegant">NotoSansOriya-Bold.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file variant="compact">NotoSansOriyaUI-Regular.ttf</file> + <file variant="compact">NotoSansOriyaUI-Bold.ttf</file> + </fileset> + </family> + <family> + <fileset> <file>NotoSansSinhala-Regular.ttf</file> <file>NotoSansSinhala-Bold.ttf</file> </fileset> @@ -240,6 +252,11 @@ </family> <family> <fileset> + <file>NotoSansBamum-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> <file>NotoSansBatak-Regular.ttf</file> </fileset> </family> @@ -300,11 +317,31 @@ </family> <family> <fileset> + <file>NotoSansLisu-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file>NotoSansMandaic-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> <file>NotoSansMeeteiMayek-Regular.ttf</file> </fileset> </family> <family> <fileset> + <file>NotoSansNewTaiLue-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file>NotoSansNKo-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> <file>NotoSansOlChiki-Regular.ttf</file> </fileset> </family> @@ -330,6 +367,11 @@ </family> <family> <fileset> + <file>NotoSansSyriacEstrangela-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> <file>NotoSansTagbanwa-Regular.ttf</file> </fileset> </family> @@ -350,12 +392,12 @@ </family> <family> <fileset> - <file>NotoSansYi-Regular.ttf</file> + <file>NotoSansVai-Regular.ttf</file> </fileset> </family> <family> <fileset> - <file>Lohit-Odia.ttf</file> + <file>NotoSansYi-Regular.ttf</file> </fileset> </family> <family> @@ -404,7 +446,7 @@ </fileset> </family> <!-- - Noto Sans Tai Le is intentionally kept last, to make sure it doesn't override + Tai Le and Mongolian are intentionally kept last, to make sure they don't override the East Asian punctuation for Chinese. --> <family> @@ -412,4 +454,9 @@ <file>NotoSansTaiLe-Regular.ttf</file> </fileset> </family> + <family> + <fileset> + <file>NotoSansMongolian-Regular.ttf</file> + </fileset> + </family> </familyset> diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index f285ebe..a5939fa 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -21,24 +21,6 @@ PRODUCT_COPY_FILES := \ PRODUCT_PACKAGES := \ DroidSansFallback.ttf \ - Roboto-Regular.ttf \ - Roboto-Bold.ttf \ - Roboto-Italic.ttf \ - Roboto-BoldItalic.ttf \ - Roboto-Black.ttf \ - Roboto-BlackItalic.ttf \ - Roboto-Light.ttf \ - Roboto-LightItalic.ttf \ - Roboto-Medium.ttf \ - Roboto-MediumItalic.ttf \ - Roboto-Thin.ttf \ - Roboto-ThinItalic.ttf \ - RobotoCondensed-Regular.ttf \ - RobotoCondensed-Bold.ttf \ - RobotoCondensed-Italic.ttf \ - RobotoCondensed-BoldItalic.ttf \ - RobotoCondensed-Light.ttf \ - RobotoCondensed-LightItalic.ttf \ DroidSansMono.ttf \ Clockopia.ttf \ AndroidClock.ttf \ diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml index 37527e9..44ea1c9 100644 --- a/data/fonts/fonts.xml +++ b/data/fonts/fonts.xml @@ -191,6 +191,14 @@ <font weight="400" style="normal">NotoSansKannadaUI-Regular.ttf</font> <font weight="700" style="normal">NotoSansKannadaUI-Bold.ttf</font> </family> + <family variant="elegant"> + <font weight="400" style="normal">NotoSansOriya-Regular.ttf</font> + <font weight="700" style="normal">NotoSansOriya-Bold.ttf</font> + </family> + <family variant="compact"> + <font weight="400" style="normal">NotoSansOriyaUI-Regular.ttf</font> + <font weight="700" style="normal">NotoSansOriyaUI-Bold.ttf</font> + </family> <family> <font weight="400" style="normal">NotoSansSinhala-Regular.ttf</font> <font weight="700" style="normal">NotoSansSinhala-Bold.ttf</font> @@ -231,6 +239,9 @@ <font weight="400" style="normal">NotoSansBalinese-Regular.ttf</font> </family> <family> + <font weight="400" style="normal">NotoSansBamum-Regular.ttf</font> + </family> + <family> <font weight="400" style="normal">NotoSansBatak-Regular.ttf</font> </family> <family> @@ -267,9 +278,21 @@ <font weight="400" style="normal">NotoSansLimbu-Regular.ttf</font> </family> <family> + <font weight="400" style="normal">NotoSansLisu-Regular.ttf</font> + </family> + <family> + <font weight="400" style="normal">NotoSansMandaic-Regular.ttf</font> + </family> + <family> <font weight="400" style="normal">NotoSansMeeteiMayek-Regular.ttf</font> </family> <family> + <font weight="400" style="normal">NotoSansNewTaiLue-Regular.ttf</font> + </family> + <family> + <font weight="400" style="normal">NotoSansNKo-Regular.ttf</font> + </family> + <family> <font weight="400" style="normal">NotoSansOlChiki-Regular.ttf</font> </family> <family> @@ -285,6 +308,9 @@ <font weight="400" style="normal">NotoSansSylotiNagri-Regular.ttf</font> </family> <family> + <font weight="400" style="normal">NotoSansSyriacEstrangela-Regular.ttf</font> + </family> + <family> <font weight="400" style="normal">NotoSansTagbanwa-Regular.ttf</font> </family> <family> @@ -297,10 +323,10 @@ <font weight="400" style="normal">NotoSansTifinagh-Regular.ttf</font> </family> <family> - <font weight="400" style="normal">NotoSansYi-Regular.ttf</font> + <font weight="400" style="normal">NotoSansVai-Regular.ttf</font> </family> <family> - <font weight="400" style="normal">Lohit-Odia.ttf</font> + <font weight="400" style="normal">NotoSansYi-Regular.ttf</font> </family> <family lang="zh-Hans"> <font weight="400" style="normal">NotoSansHans-Regular.otf</font> @@ -330,10 +356,13 @@ <font weight="400" style="normal">MTLmr3m.ttf</font> </family> <!-- - Noto Sans Tai Le is intentionally kept last, to make sure it doesn't override + Tai Le and Mongolian are intentionally kept last, to make sure they don't override the East Asian punctuation for Chinese. --> <family> <font weight="400" style="normal">NotoSansTaiLe-Regular.ttf</font> </family> + <family> + <font weight="400" style="normal">NotoSansMongolian-Regular.ttf</font> + </family> </familyset> |