From 21af7b6a9f8574765a5a21b470371198ee4384ce Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Thu, 16 Jan 2014 18:34:46 -0500
Subject: [PATCH] update battery state on device resume

---
 frontend/ui/reader/readerrolling.lua |  8 ++++++++
 frontend/ui/uimanager.lua            | 10 ++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/frontend/ui/reader/readerrolling.lua b/frontend/ui/reader/readerrolling.lua
index 67b716de1..2ab3aa3d1 100644
--- a/frontend/ui/reader/readerrolling.lua
+++ b/frontend/ui/reader/readerrolling.lua
@@ -216,6 +216,14 @@ function ReaderRolling:onPageUpdate(new_page)
 	self:updateBatteryState()
 end
 
+function ReaderRolling:onResume()
+	self:updateBatteryState()
+end
+
+function ReaderRolling:onNotCharging()
+	self:updateBatteryState()
+end
+
 function ReaderRolling:onGotoPercent(percent)
 	DEBUG("goto document offset in percent:", percent)
 	self:gotoPercent(percent)
diff --git a/frontend/ui/uimanager.lua b/frontend/ui/uimanager.lua
index c383237ba..13dc07dc8 100644
--- a/frontend/ui/uimanager.lua
+++ b/frontend/ui/uimanager.lua
@@ -287,10 +287,11 @@ function UIManager:run()
 				Device:usbPlugIn()
 			elseif input_event == "NotCharging" then
 				Device:usbPlugOut()
+				self:sendEvent(Event:new("NotCharging"))
 			elseif input_event == "Light" then
 				Device:getPowerDevice():toggleFrontlight()
-			elseif (input_event == "Power" and not Device.screen_saver_mode) or
-			input_event == "Suspend" then
+			elseif (input_event == "Power" and not Device.screen_saver_mode)
+					or input_event == "Suspend" then
 				local InfoMessage = require("ui/widget/infomessage")
 				self:show(InfoMessage:new{
 					text = _("Standby"),
@@ -298,9 +299,10 @@ function UIManager:run()
 				})
 				Device:prepareSuspend()
 				self:scheduleIn(0.5, function() Device:Suspend() end)
-			elseif (input_event == "Power" and Device.screen_saver_mode) or
-			input_event == "Resume" then
+			elseif (input_event == "Power" and Device.screen_saver_mode)
+					or input_event == "Resume" then
 				Device:Resume()
+				self:sendEvent(Event:new("Resume"))
 			else
 				self:sendEvent(input_event)
 			end