From 959bf732afc847370c603e80174fdf69c580d4c6 Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Sun, 13 Mar 2016 18:38:09 -0700
Subject: [PATCH 1/3] bump base

---
 base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base b/base
index 21066ecb7..8cdf52685 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 21066ecb73feec8366c7557cae901c343b67f1eb
+Subproject commit 8cdf526854572969436f7820eab73d99a57e9bed

From e9a56243731bc469eb3ecd259a149e7c120c36b0 Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Sun, 13 Mar 2016 19:48:28 -0700
Subject: [PATCH 2/3] fix(bookstatus): enforce status page height to screen
 height

---
 frontend/ui/widget/bookstatuswidget.lua | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/frontend/ui/widget/bookstatuswidget.lua b/frontend/ui/widget/bookstatuswidget.lua
index 795db202a..4e829429a 100644
--- a/frontend/ui/widget/bookstatuswidget.lua
+++ b/frontend/ui/widget/bookstatuswidget.lua
@@ -76,32 +76,31 @@ function BookStatusWidget:init()
         enabled = true,
         show_parent = self,
     }
-
-    local statusContainer = FrameContainer:new{
-        dimen = Screen:getSize(),
+    local screen_size = Screen:getSize()
+    self[1] = FrameContainer:new{
+        width = screen_size.w,
+        height = screen_size.h,
         background = Blitbuffer.COLOR_WHITE,
         bordersize = 0,
         padding = 0,
-        self:showStatus(),
+        self:getStatusContent(screen_size.w),
     }
-    self[1] = statusContainer
 end
 
-function BookStatusWidget:showStatus()
-    local screen_width = Screen:getWidth()
+function BookStatusWidget:getStatusContent(width)
     return VerticalGroup:new{
         align = "left",
         OverlapGroup:new{
-            dimen = Geom:new{ w = screen_width, h = Screen:scaleBySize(30) },
+            dimen = Geom:new{ w = width, h = Screen:scaleBySize(30) },
             CloseButton:new{ window = self },
         },
         self:genBookInfoGroup(),
         self:genHeader(_("Statistics")),
-        self:genStatisticsGroup(screen_width),
+        self:genStatisticsGroup(width),
         self:genHeader(_("Review")),
-        self:genSummaryGroup(screen_width),
+        self:genSummaryGroup(width),
         self:genHeader(_("Update Status")),
-        self:generateSwitchGroup(screen_width),
+        self:generateSwitchGroup(width),
     }
 end
 

From 55fa046d497d4a5800728e530e3a92be7d5921d1 Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Sun, 13 Mar 2016 19:49:13 -0700
Subject: [PATCH 3/3] android: set android log tag to KOReader

---
 kodev                           | 2 +-
 platform/android/llapp_main.lua | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/kodev b/kodev
index d300d6a37..a8d2fab10 100755
--- a/kodev
+++ b/kodev
@@ -336,7 +336,7 @@ TARGET:
             exit 0
             ;;
         android)
-            adb logcat 'luajit-launcher:D *:S'
+            adb logcat 'luajit-launcher:D KOReader:D *:S'
             ;;
         *)
             echo "Unsupported target: $1."
diff --git a/platform/android/llapp_main.lua b/platform/android/llapp_main.lua
index 85088f006..fd13da504 100644
--- a/platform/android/llapp_main.lua
+++ b/platform/android/llapp_main.lua
@@ -1,5 +1,6 @@
 local A = require("android")
 A.dl.library_path = A.dl.library_path .. ":" .. A.dir .. "/libs"
+A.log_name = 'KOReader'
 
 local ffi = require("ffi")
 ffi.cdef[[