Remove support for non-TTF fonts
This patch set removes support in TWRP for the old .dat file
format as well as support for the AOSP style fonts in header
files. We need TTF for scaling.
Note that the old AOSP style header font is still supported in
minui which is not used by TWRP.
Change-Id: I6124a3333d479f1fc668138f7e32c4be9b519552
diff --git a/gui/Android.mk b/gui/Android.mk
index 1fef03d..1d0d134 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -58,9 +58,6 @@
ifeq ($(TW_OEM_BUILD), true)
LOCAL_CFLAGS += -DTW_OEM_BUILD
endif
-ifeq ($(TW_DISABLE_TTF), true)
- LOCAL_CFLAGS += -DTW_DISABLE_TTF
-endif
ifneq ($(TW_X_OFFSET),)
LOCAL_CFLAGS += -DTW_X_OFFSET=$(TW_X_OFFSET)
endif
@@ -113,8 +110,7 @@
# for future copying of used include xmls and fonts:
# UI_XML := $(TWRP_THEME_LOC)/ui.xml
# TWRP_INCLUDE_XMLS := $(shell xmllint --xpath '/recovery/include/xmlfile/@name' $(UI_XML)|sed -n 's/[^\"]*\"\([^\"]*\)\"[^\"]*/\1\n/gp'|sort|uniq)
-# TWRP_FONTS_TTF := $(shell xmllint --xpath '/recovery/resources/font/@filename' $(UI_XML)|sed -n 's/[^\"]*\"\([^\"]*\)\"[^\"]*/\1\n/gp'|sort|uniq)
-# TWRP_FONTS_DAT := $(shell xmllint --xpath '/recovery/resources/font/@fallback' $(UI_XML)|sed -n 's/[^\"]*\"\([^\"]*\)\"[^\"]*/\1.dat\n/gp'|sort|uniq)
+# TWRP_FONTS_TTF := $(shell xmllint --xpath '/recovery/resources/font/@filename' $(UI_XML)|sed -n 's/[^\"]*\"\([^\"]*\)\"[^\"]*/\1\n/gp'|sort|uniq)niq)
ifeq ($(wildcard $(TWRP_THEME_LOC)/ui.xml),)
$(warning ****************************************************************************)
$(warning * TW_THEME is not valid: '$(TW_THEME)')
@@ -150,12 +146,6 @@
TWRP_THEME_LOC := $(TW_CUSTOM_THEME)
endif
-ifeq ($(TW_DISABLE_TTF), true)
- TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)fonts/*.ttf
-else
- TWRP_REMOVE_FONT := rm -f $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)fonts/*.dat
-endif
-
TWRP_RES_GEN := $(intermediates)/twrp
ifneq ($(TW_USE_TOOLBOX), true)
TWRP_SH_TARGET := /sbin/busybox
@@ -167,7 +157,6 @@
mkdir -p $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
cp -fr $(TWRP_RES) $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
cp -fr $(TWRP_THEME_LOC)/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)
- $(TWRP_REMOVE_FONT)
mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin/
ifneq ($(TW_USE_TOOLBOX), true)
ln -sf $(TWRP_SH_TARGET) $(TARGET_RECOVERY_ROOT_OUT)/sbin/sh
diff --git a/gui/devices/1080x1920/res/fonts/Roboto-Condensed-40.dat b/gui/devices/1080x1920/res/fonts/Roboto-Condensed-40.dat
deleted file mode 100644
index ff23add..0000000
--- a/gui/devices/1080x1920/res/fonts/Roboto-Condensed-40.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml
index ea3c81f..0ac3e43 100644
--- a/gui/devices/1080x1920/res/ui.xml
+++ b/gui/devices/1080x1920/res/ui.xml
@@ -14,9 +14,9 @@
</include>
<resources>
- <resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="40" fallback="Roboto-Condensed-40" />
- <resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="40" fallback="Roboto-Condensed-40" />
- <resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="40" fallback="Roboto-Condensed-40" />
+ <resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="40" />
+ <resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="40" />
+ <resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="40" />
<resource name="fixed" type="font" filename="DroidSansMono.ttf" size="30" />
<resource name="twrplogo" type="image" filename="twrplogo" retainaspect="1" />
<resource name="main_button" type="image" filename="menu-button" />
diff --git a/gui/devices/1920x1200/res/fonts/Roboto-Regular-30.dat b/gui/devices/1920x1200/res/fonts/Roboto-Regular-30.dat
deleted file mode 100644
index 9f8082c..0000000
--- a/gui/devices/1920x1200/res/fonts/Roboto-Regular-30.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index 4cc578c..8171cf5 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -14,7 +14,7 @@
</include>
<resources>
- <resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="30" fallback="Roboto-Regular-30" />
+ <resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="30" />
<resource name="fixed" type="font" filename="DroidSansMono.ttf" size="22" />
<resource name="twrplogo" type="image" filename="twrplogo" retainaspect="1" />
<resource name="main_button" type="image" filename="button" />
diff --git a/gui/devices/320x320/res/fonts/Roboto-Condensed-14.dat b/gui/devices/320x320/res/fonts/Roboto-Condensed-14.dat
deleted file mode 100644
index f7b174c..0000000
--- a/gui/devices/320x320/res/fonts/Roboto-Condensed-14.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/320x320/res/ui.xml b/gui/devices/320x320/res/ui.xml
index 0918e3b..afe2509 100644
--- a/gui/devices/320x320/res/ui.xml
+++ b/gui/devices/320x320/res/ui.xml
@@ -15,9 +15,9 @@
</include>
<resources>
- <resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="14" fallback="Roboto-Condensed-14" />
- <resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="14" fallback="Roboto-Condensed-14" />
- <resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="14" fallback="Roboto-Condensed-14" />
+ <resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="14" />
+ <resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="14" />
+ <resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="14" />
<resource name="fixed" type="font" filename="DroidSansMono.ttf" size="12" />
<resource name="twrplogo" type="image" filename="twrplogo" retainaspect="1" />
<resource name="main_button" type="image" filename="menu-button" />
diff --git a/gui/devices/480x800/res/fonts/Roboto-Regular-20.dat b/gui/devices/480x800/res/fonts/Roboto-Regular-20.dat
deleted file mode 100644
index 6588b41..0000000
--- a/gui/devices/480x800/res/fonts/Roboto-Regular-20.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index 49c4bb9..c406e66 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -14,9 +14,9 @@
</include>
<resources>
- <resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
- <resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
- <resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
+ <resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="20" />
+ <resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="20" />
+ <resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="20" />
<resource name="fixed" type="font" filename="DroidSansMono.ttf" size="16" />
<resource name="twrplogo" type="image" filename="twrplogo" retainaspect="1" />
<resource name="main_button" type="image" filename="menu-button" />
diff --git a/gui/devices/800x480/res/fonts/Roboto-Condensed-16.dat b/gui/devices/800x480/res/fonts/Roboto-Condensed-16.dat
deleted file mode 100644
index 19c1147..0000000
--- a/gui/devices/800x480/res/fonts/Roboto-Condensed-16.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index 032f996..a9bf904 100644
--- a/gui/devices/800x480/res/ui.xml
+++ b/gui/devices/800x480/res/ui.xml
@@ -14,7 +14,7 @@
</include>
<resources>
- <resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="16" fallback="Roboto-Condensed-16" />
+ <resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="16" />
<resource name="fixed" type="font" filename="DroidSansMono.ttf" size="12" />
<resource name="twrplogo" type="image" filename="twrplogo" retainaspect="1" />
<resource name="main_button" type="image" filename="button" />
diff --git a/gui/devices/resources/fonts/Roboto-Condensed-10.dat b/gui/devices/resources/fonts/Roboto-Condensed-10.dat
deleted file mode 100644
index 02e869b..0000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-10.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Condensed-12.dat b/gui/devices/resources/fonts/Roboto-Condensed-12.dat
deleted file mode 100644
index b48c4f2..0000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-12.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Condensed-14.dat b/gui/devices/resources/fonts/Roboto-Condensed-14.dat
deleted file mode 100644
index f7b174c..0000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-14.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Condensed-16.dat b/gui/devices/resources/fonts/Roboto-Condensed-16.dat
deleted file mode 100644
index 19c1147..0000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-16.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Condensed-20.dat b/gui/devices/resources/fonts/Roboto-Condensed-20.dat
deleted file mode 100644
index 531d5fd..0000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-20.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Condensed-25.dat b/gui/devices/resources/fonts/Roboto-Condensed-25.dat
deleted file mode 100644
index 7cee713..0000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-25.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Condensed-30.dat b/gui/devices/resources/fonts/Roboto-Condensed-30.dat
deleted file mode 100644
index 621b332..0000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-30.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Condensed-40.dat b/gui/devices/resources/fonts/Roboto-Condensed-40.dat
deleted file mode 100644
index ff23add..0000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-40.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Condensed-50.dat b/gui/devices/resources/fonts/Roboto-Condensed-50.dat
deleted file mode 100644
index ae9c0f6..0000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-50.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Condensed-60.dat b/gui/devices/resources/fonts/Roboto-Condensed-60.dat
deleted file mode 100644
index 22f9acc..0000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-60.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Regular-10.dat b/gui/devices/resources/fonts/Roboto-Regular-10.dat
deleted file mode 100644
index b1faa7d..0000000
--- a/gui/devices/resources/fonts/Roboto-Regular-10.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Regular-12.dat b/gui/devices/resources/fonts/Roboto-Regular-12.dat
deleted file mode 100644
index 1c9f058..0000000
--- a/gui/devices/resources/fonts/Roboto-Regular-12.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Regular-14.dat b/gui/devices/resources/fonts/Roboto-Regular-14.dat
deleted file mode 100644
index 5a6fff8..0000000
--- a/gui/devices/resources/fonts/Roboto-Regular-14.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Regular-16.dat b/gui/devices/resources/fonts/Roboto-Regular-16.dat
deleted file mode 100644
index 9f6d900..0000000
--- a/gui/devices/resources/fonts/Roboto-Regular-16.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Regular-20.dat b/gui/devices/resources/fonts/Roboto-Regular-20.dat
deleted file mode 100644
index 6588b41..0000000
--- a/gui/devices/resources/fonts/Roboto-Regular-20.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Regular-25.dat b/gui/devices/resources/fonts/Roboto-Regular-25.dat
deleted file mode 100644
index 392cce9..0000000
--- a/gui/devices/resources/fonts/Roboto-Regular-25.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Regular-30.dat b/gui/devices/resources/fonts/Roboto-Regular-30.dat
deleted file mode 100644
index 9f8082c..0000000
--- a/gui/devices/resources/fonts/Roboto-Regular-30.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Regular-40.dat b/gui/devices/resources/fonts/Roboto-Regular-40.dat
deleted file mode 100644
index 637d9fe..0000000
--- a/gui/devices/resources/fonts/Roboto-Regular-40.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Regular-50.dat b/gui/devices/resources/fonts/Roboto-Regular-50.dat
deleted file mode 100644
index aecce38..0000000
--- a/gui/devices/resources/fonts/Roboto-Regular-50.dat
+++ /dev/null
Binary files differ
diff --git a/gui/devices/resources/fonts/Roboto-Regular-60.dat b/gui/devices/resources/fonts/Roboto-Regular-60.dat
deleted file mode 100644
index 5840bed..0000000
--- a/gui/devices/resources/fonts/Roboto-Regular-60.dat
+++ /dev/null
Binary files differ
diff --git a/gui/resources.cpp b/gui/resources.cpp
index 41655c3..361f1d8 100644
--- a/gui/resources.cpp
+++ b/gui/resources.cpp
@@ -113,7 +113,6 @@
file = attr->value();
-#ifndef TW_DISABLE_TTF
if(file.size() >= 4 && file.compare(file.size()-4, 4, ".ttf") == 0)
{
m_type = TYPE_TTF;
@@ -141,28 +140,8 @@
}
}
else
-#endif
{
- m_type = TYPE_TWRP;
-
- if(file.size() >= 4 && file.compare(file.size()-4, 4, ".ttf") == 0)
- {
- attr = node->first_attribute("fallback");
- if (!attr)
- return;
-
- file = attr->value();
- }
-
- if (ExtractResource(pZip, "fonts", file, ".dat", TMP_RESOURCE_NAME) == 0)
- {
- mFont = gr_loadFont(TMP_RESOURCE_NAME);
- unlink(TMP_RESOURCE_NAME);
- }
- else
- {
- mFont = gr_loadFont(file.c_str());
- }
+ LOGERR("Non-TTF fonts are no longer supported.\n");
}
}
@@ -170,12 +149,8 @@
{
if(mFont)
{
-#ifndef TW_DISABLE_TTF
if(m_type == TYPE_TTF)
gr_ttf_freeFont(mFont);
- else
-#endif
- gr_freeFont(mFont);
}
}