32 files changed, 13 insertions, 49 deletions

diff --git a/gui/Android.mk b/gui/Android.mk
index 1fef03d41..1d0d134ec 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -58,9 +58,6 @@ endif
 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 @@ ifeq ($(TWRP_NEW_THEME),true)
 # 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 @@ else
     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 @@ $(TWRP_RES_GEN):
 	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 ff23add82..000000000
--- a/gui/devices/1080x1920/res/fonts/Roboto-Condensed-40.dat
+++ /dev/null
diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml
index ea3c81f83..0ac3e43b4 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 9f8082ccc..000000000
--- a/gui/devices/1920x1200/res/fonts/Roboto-Regular-30.dat
+++ /dev/null
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index 4cc578c7b..8171cf596 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 f7b174cb1..000000000
--- a/gui/devices/320x320/res/fonts/Roboto-Condensed-14.dat
+++ /dev/null
diff --git a/gui/devices/320x320/res/ui.xml b/gui/devices/320x320/res/ui.xml
index 0918e3bbd..afe2509db 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 6588b41e7..000000000
--- a/gui/devices/480x800/res/fonts/Roboto-Regular-20.dat
+++ /dev/null
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index 49c4bb933..c406e66ef 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 19c11470d..000000000
--- a/gui/devices/800x480/res/fonts/Roboto-Condensed-16.dat
+++ /dev/null
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index 032f996c3..a9bf904bb 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 02e869b78..000000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-10.dat
+++ /dev/null
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 b48c4f213..000000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-12.dat
+++ /dev/null
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 f7b174cb1..000000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-14.dat
+++ /dev/null
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 19c11470d..000000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-16.dat
+++ /dev/null
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 531d5fdaf..000000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-20.dat
+++ /dev/null
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 7cee713e7..000000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-25.dat
+++ /dev/null
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 621b33214..000000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-30.dat
+++ /dev/null
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 ff23add82..000000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-40.dat
+++ /dev/null
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 ae9c0f64d..000000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-50.dat
+++ /dev/null
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 22f9accd1..000000000
--- a/gui/devices/resources/fonts/Roboto-Condensed-60.dat
+++ /dev/null
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 b1faa7d1c..000000000
--- a/gui/devices/resources/fonts/Roboto-Regular-10.dat
+++ /dev/null
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 1c9f058c3..000000000
--- a/gui/devices/resources/fonts/Roboto-Regular-12.dat
+++ /dev/null
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 5a6fff8b9..000000000
--- a/gui/devices/resources/fonts/Roboto-Regular-14.dat
+++ /dev/null
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 9f6d90005..000000000
--- a/gui/devices/resources/fonts/Roboto-Regular-16.dat
+++ /dev/null
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 6588b41e7..000000000
--- a/gui/devices/resources/fonts/Roboto-Regular-20.dat
+++ /dev/null
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 392cce97d..000000000
--- a/gui/devices/resources/fonts/Roboto-Regular-25.dat
+++ /dev/null
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 9f8082ccc..000000000
--- a/gui/devices/resources/fonts/Roboto-Regular-30.dat
+++ /dev/null
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 637d9fe5b..000000000
--- a/gui/devices/resources/fonts/Roboto-Regular-40.dat
+++ /dev/null
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 aecce38f0..000000000
--- a/gui/devices/resources/fonts/Roboto-Regular-50.dat
+++ /dev/null
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 5840beda2..000000000
--- a/gui/devices/resources/fonts/Roboto-Regular-60.dat
+++ /dev/null
diff --git a/gui/resources.cpp b/gui/resources.cpp
index 41655c376..361f1d8e0 100644
--- a/gui/resources.cpp
+++ b/gui/resources.cpp
@@ -113,7 +113,6 @@ FontResource::FontResource(xml_node<>* node, ZipArchive* pZip)
 
 	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 @@ FontResource::FontResource(xml_node<>* node, ZipArchive* pZip)
 		}
 	}
 	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 @@ FontResource::~FontResource()
 {
 	if(mFont)
 	{
-#ifndef TW_DISABLE_TTF
 		if(m_type == TYPE_TTF)
 			gr_ttf_freeFont(mFont);
-		else
-#endif
-			gr_freeFont(mFont);
 	}
 }