add Device:hasKeyboard to help initialize UI components

So that kindle4 won't have all the gesture event registered.
This commit is contained in:
Qingping Hou
2012-12-10 19:01:32 -05:00
parent bf86cf7a93
commit 1b7357fc0f
2 changed files with 13 additions and 6 deletions

View File

@@ -1,6 +1,7 @@
Device = {
screen_saver_mode = false,
charging_mode = false,
model = nil,
}
function Device:getModel()
@@ -65,9 +66,18 @@ function Device:isKindle2()
end
end
function Device:hasNoKeyboard()
if not self.model then
self.model = self:getModel()
end
return self:isTouchDevice() or (self.model == "Kindle4")
end
function Device:isTouchDevice()
local model = self:getModel()
return (model == "Kindle4") or (model == "KindlePaperWhite") or (model == "KindleTouch") or util.isEmulated()
if not self.model then
self.model = self:getModel()
end
return (self.model == "KindlePaperWhite") or (self.model == "KindleTouch") or util.isEmulated()
end
function Device:intoScreenSaver()

View File

@@ -62,9 +62,6 @@ end
-- option parsing:
longopts = {
password = "p",
goto = "g",
gamma = "G",
debug = "d",
help = "h",
}
@@ -97,7 +94,7 @@ else
DEBUG = function() end
end
if Device.isKindle4() or Device:isTouchDevice() then
if Device:hasNoKeyboard() then
-- remove menu item shortcut for K4
Menu.is_enable_shortcut = false
end