From 751c61bd69eaa86506d02e4ce244d5d3ae6990ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Tue, 6 Jun 2017 15:45:43 +0200
Subject: [PATCH] We are already shipping Roboto-Condensed.ttf, let's use it

---
 android/src/org/ppsspp/ppsspp/NativeActivity.java |  1 +
 android/src/org/ppsspp/ppsspp/TextRenderer.java   | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java
index bb0513561a..f96d70713c 100644
--- a/android/src/org/ppsspp/ppsspp/NativeActivity.java
+++ b/android/src/org/ppsspp/ppsspp/NativeActivity.java
@@ -406,6 +406,7 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback {
 	@Override
     public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		TextRenderer.init(this);
 		shuttingDown = false;
 		registerCallbacks();
 
diff --git a/android/src/org/ppsspp/ppsspp/TextRenderer.java b/android/src/org/ppsspp/ppsspp/TextRenderer.java
index 00d682b311..8eff130e86 100644
--- a/android/src/org/ppsspp/ppsspp/TextRenderer.java
+++ b/android/src/org/ppsspp/ppsspp/TextRenderer.java
@@ -1,17 +1,30 @@
 package org.ppsspp.ppsspp;
+import android.content.Context;
 import android.graphics.*;
+import android.util.Log;
 
 import java.nio.ByteBuffer;
 
 public class TextRenderer {
 	private static Paint p;
 	private static Paint bg;
+	private static Typeface robotoCondensed;
+	private static final String TAG = "TextRenderer";
 	static {
 		p = new Paint(Paint.SUBPIXEL_TEXT_FLAG | Paint.ANTI_ALIAS_FLAG);
 		p.setColor(Color.WHITE);
 		bg = new Paint();
 		bg.setColor(Color.BLACK);
 	}
+	public static void init(Context ctx) {
+		robotoCondensed = Typeface.createFromAsset(ctx.getAssets(), "Roboto-Condensed.ttf");
+		if (robotoCondensed != null) {
+			Log.i(TAG, "Successfully loaded Roboto Condensed");
+			p.setTypeface(robotoCondensed);
+		} else {
+			Log.e(TAG, "Failed to load Roboto Condensed");
+		}
+	}
 	private static Point measure(String string, double textSize) {
 		Rect bound = new Rect();
 		p.setTextSize((float)textSize);