summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Anton Lundin <glance@acc.umu.se>2014-08-24 23:43:42 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-08-25 13:54:12 -0700
commit65eec59739ca9cfe875a8787cef673d878e566b6 (patch)
tree68bca17789576b98efd73c814d50d3d8c005cad2
parent7575eb44df7541e4a2ad1f073c4f1b8e139c3cfd (diff)
downloadsubsurface-65eec59739ca9cfe875a8787cef673d878e566b6.tar.gz
Fix android font config
In e893f6bd9db696a1d647b796138233152ca290fa ("Use the Windows default font on Windows 7 and 8/8.1") font config was changed, but the android font config wasn't changed. This updates the android font config to match the new way. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--android.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/android.cpp b/android.cpp
index 93f26730b..66bc6cf3e 100644
--- a/android.cpp
+++ b/android.cpp
@@ -11,9 +11,15 @@
extern "C" {
-const char system_divelist_default_font[] = "Roboto";
+const char android_system_divelist_default_font[] = "Roboto";
+const char *system_divelist_default_font = android_system_divelist_default_font;
const int system_divelist_default_font_size = 8;
+void subsurface_OS_pref_setup(void)
+{
+ // nothing
+}
+
const char *system_default_filename(void)
{
/* Replace this when QtCore/QStandardPaths getExternalStorageDirectory landed */