From f0c675d722ca35447c40fc9ef611d6cfc0ffebb2 Mon Sep 17 00:00:00 2001
From: zijiehe <zijiehe@google.com>
Date: Mon, 29 Feb 2016 15:08:57 +0800
Subject: [PATCH] E-ink optimization setting should be correctly set after
 restart.

---
 frontend/device/generic/device.lua | 3 +++
 frontend/ui/screen.lua             | 8 --------
 2 files changed, 3 insertions(+), 8 deletions(-)
 delete mode 100644 frontend/ui/screen.lua

diff --git a/frontend/device/generic/device.lua b/frontend/device/generic/device.lua
index 19f465b96..a93c5bcc4 100644
--- a/frontend/device/generic/device.lua
+++ b/frontend/device/generic/device.lua
@@ -52,6 +52,9 @@ function Device:init()
         error("screen/framebuffer must be implemented")
     end
 
+    local is_eink = G_reader_settings:readSetting("eink")
+    self.screen.eink = (is_eink == nill) or is_eink
+
     DEBUG("initializing for device", self.model)
     DEBUG("framebuffer resolution:", self.screen:getSize())
 
diff --git a/frontend/ui/screen.lua b/frontend/ui/screen.lua
deleted file mode 100644
index a1433f593..000000000
--- a/frontend/ui/screen.lua
+++ /dev/null
@@ -1,8 +0,0 @@
--- compatibility wrapper
-local Screen = require("device").screen
-
--- set eink flag for this screen
-local is_eink = G_reader_settings:readSetting("eink")
-Screen.eink = (is_eink == nil) and true or is_eink
-
-return Screen