commit ecbd3e8ba9d84eca9d4fdea9b24717364f81a668
author Ethan Yonker <dees_troy@teamw.in> Thu Dec 14 14:43:59 2017 -0600
committer Ethan Yonker <dees_troy@teamw.in> Fri Dec 15 12:48:49 2017 -0600
tree d3027aeb161e13673416d1684e6f4e47c85241d0
parent ea4efc6d200a493084a90e80d9eb0dc5ffa96cdb
parent 435a2031d62e868aae928ec3c4090ea3bbea3397

Merge up to android-8.1.0_r1 and fix conflicts

Change-Id: I2dc060134d15ec9f015a606cb24ef8276f6af1fc

minui/include/minui/minui.h

diff --git a/minui/include/minui/minui.h b/minui/include/minui/minui.h
index 766b943..bd8c386 100644
--- a/minui/include/minui/minui.h
+++ b/minui/include/minui/minui.h
@@ -91,7 +91,12 @@
 using ev_callback = std::function<int(int fd, uint32_t epevents)>;
 using ev_set_key_callback = std::function<int(int code, int value)>;
 
+#ifdef TW_USE_MINUI_WITH_OPTIONAL_TOUCH_EVENTS
+int ev_init(ev_callback input_cb, bool allow_touch_inputs = false);
+void ev_iterate_touch_inputs(const std::function<void(int)>& action);
+#else
 int ev_init(ev_callback input_cb);
+#endif
 int ev_add_fd(int fd, ev_callback cb);
 int ev_sync_key_state(const ev_set_key_callback& set_key_cb);
 #endif