Disable slow stroke on Android

Changed files (4)

• modified libbirdfont/DrawingTools.vala
• modified libbirdfont/Path.vala
• modified libbirdfont/Test.vala
• modified scripts/AndroidBirdFont.mk

Diff

diff --git a/libbirdfont/DrawingTools.vala b/libbirdfont/DrawingTools.valaindex 2470c2c..fc7e6d2 100644--- a/libbirdfont/DrawingTools.vala+++ b/libbirdfont/DrawingTools.vala@@ -147,8 +147,9 @@ public class DrawingTools : ToolCollection  { 		zoom_tool.select_action.connect ((self) => { 			update_drawing_and_background_tools (self); 		});+#if ANDROID == false 		draw_tools.add_tool (zoom_tool);-+#endif 		move_tool = new MoveTool ("move"); 		move_tool.select_action.connect ((self) => { 			update_drawing_and_background_tools (self);diff --git a/libbirdfont/Path.vala b/libbirdfont/Path.valaindex b504d1b..b30700e 100644--- a/libbirdfont/Path.vala+++ b/libbirdfont/Path.vala@@ -2322,9 +2322,11 @@ public class Path { 	} 	 	public void create_full_stroke () {+#if ANDROID == false 		if (stroke > 0) { 			full_stroke = StrokeTool.get_stroke (this, stroke); 		}+#endif 	} 	 	public PathList get_stroke () {diff --git a/libbirdfont/Test.vala b/libbirdfont/Test.valaindex 54ec9e7..e2ffaba 100644--- a/libbirdfont/Test.vala+++ b/libbirdfont/Test.vala@@ -47,12 +47,12 @@ public class Test : Object { 	} 	 	public void print () {-		stdout.printf (get_time ());+		stdout.printf (get_test_time ()); 	} 	-	public string get_time () {+	public string get_test_time () { 		double stop_time = GLib.get_real_time ();-		return @"$name $((stop_time - start_time) / 1000000.0)s\n";+		return @"$name $((stop_time - time_stamp) / 1000000.0)s\n"; 	} } diff --git a/scripts/AndroidBirdFont.mk b/scripts/AndroidBirdFont.mkindex 339651a..f285956 100644--- a/scripts/AndroidBirdFont.mk+++ b/scripts/AndroidBirdFont.mk@@ -19,8 +19,8 @@ LOCAL_CFLAGS    += -I /opt/android/include/cairo  #FIXME: $(TARGET_ARCH_ABI) +LOCAL_LDLIBS    += /opt/android/lib/libsqlite.a LOCAL_LDLIBS	+= -L/opt/android/lib-LOCAL_LDLIBS    += -lsqliteX LOCAL_LDLIBS    += -ljava-bitmap  LOCAL_LDLIBS    += -lgee LOCAL_LDLIBS    += -lft2