From 3520e0c47e5e18b5d749e6ba0f513bb851193365 Mon Sep 17 00:00:00 2001 From: chrox Date: Wed, 28 May 2014 12:57:53 +0800 Subject: [PATCH] partially working android build Now the Android build should read PDF and EPUB documents with limited gestures recognized such as "tap" and "swipe" --- frontend/dbg.lua | 6 ++---- frontend/ui/device.lua | 1 + koreader-base | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/dbg.lua b/frontend/dbg.lua index 948f82315..c3471a27f 100644 --- a/frontend/dbg.lua +++ b/frontend/dbg.lua @@ -32,10 +32,8 @@ function Dbg:turnOn() self.is_on = true -- create or clear ev log file - if not isAndroid then - os.execute("echo > ev.log") - self.ev_log = io.open("ev.log", "w") - end + os.execute("echo > ev.log") + self.ev_log = io.open("ev.log", "w") end function Dbg:logEv(ev) diff --git a/frontend/ui/device.lua b/frontend/ui/device.lua index c83dd59a2..37dcbdb8d 100644 --- a/frontend/ui/device.lua +++ b/frontend/ui/device.lua @@ -117,6 +117,7 @@ function Device:isTouchDevice() local model = self:getModel() self.is_touch_device = (model == "KindlePaperWhite") or (model == "KindlePaperWhite2") or (model == "KindleTouch") or self:isKobo() or util.isEmulated() + or util.isAndroid() return self.is_touch_device end diff --git a/koreader-base b/koreader-base index 0a3acc6bc..b74c59e88 160000 --- a/koreader-base +++ b/koreader-base @@ -1 +1 @@ -Subproject commit 0a3acc6bc64fbe42b7072d5100724992faca1514 +Subproject commit b74c59e886d4bbc316ac575bec06c1f15c428504