From 23f159724654bf5ea1470d4e949eedf9f046048d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Fern=C3=A1ndez?= Date: Mon, 21 Jan 2019 22:44:13 +0100 Subject: [PATCH] android: disable exit menu --- frontend/apps/filemanager/filemanagermenu.lua | 5 +++++ frontend/apps/reader/modules/readermenu.lua | 5 +++++ frontend/ui/elements/filemanager_menu_order.lua | 6 ++++++ frontend/ui/elements/reader_menu_order.lua | 6 ++++++ 4 files changed, 22 insertions(+) diff --git a/frontend/apps/filemanager/filemanagermenu.lua b/frontend/apps/filemanager/filemanagermenu.lua index 3c7d3c582..3978a30de 100644 --- a/frontend/apps/filemanager/filemanagermenu.lua +++ b/frontend/apps/filemanager/filemanagermenu.lua @@ -291,6 +291,11 @@ function FileManagerMenu:setUpdateItemTable() self:exitOrRestart(function() UIManager:restartKOReader() end) end, } + if Device:isAndroid() then + self.menu_items.exit_menu = self.menu_items.exit + self.menu_items.exit = nil + self.menu_items.restart_koreader = nil + end if not Device:isTouchDevice() then --add a shortcut on non touch-device --because this menu is not accessible otherwise diff --git a/frontend/apps/reader/modules/readermenu.lua b/frontend/apps/reader/modules/readermenu.lua index 2aa64f2fd..82139b856 100644 --- a/frontend/apps/reader/modules/readermenu.lua +++ b/frontend/apps/reader/modules/readermenu.lua @@ -185,6 +185,11 @@ function ReaderMenu:setUpdateItemTable() self:exitOrRestart(function() UIManager:restartKOReader() end) end, } + if Device:isAndroid() then + self.menu_items.exit_menu = self.menu_items.exit + self.menu_items.exit = nil + self.menu_items.restart_koreader = nil + end local getPreviousFile = function() local previous_file = nil diff --git a/frontend/ui/elements/filemanager_menu_order.lua b/frontend/ui/elements/filemanager_menu_order.lua index eaf800e3d..7817663b5 100644 --- a/frontend/ui/elements/filemanager_menu_order.lua +++ b/frontend/ui/elements/filemanager_menu_order.lua @@ -1,3 +1,5 @@ +local Device = require("device") + local order = { ["KOMenu:menu_buttons"] = { "filemanager_settings", @@ -119,4 +121,8 @@ local order = { } } +if Device:isAndroid() then + order.exit_menu = nil +end + return order diff --git a/frontend/ui/elements/reader_menu_order.lua b/frontend/ui/elements/reader_menu_order.lua index d91e5dca1..c380e993f 100644 --- a/frontend/ui/elements/reader_menu_order.lua +++ b/frontend/ui/elements/reader_menu_order.lua @@ -1,3 +1,5 @@ +local Device = require("device") + local order = { ["KOMenu:menu_buttons"] = { "navi", @@ -142,4 +144,8 @@ local order = { } } +if Device:isAndroid() then + order.exit_menu = nil +end + return order