summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorbigbiff bigbiff <bigbiff@teamw.in>2013-02-28 02:50:43 +0100
committerbigbiff bigbiff <bigbiff@teamw.in>2013-02-28 02:50:43 +0100
commitf8e2f375656b5ed8e90a501aea4f6925fe7d7d5d (patch)
tree5761efa0ffe4cdcaa3aa31a10820f480df8d5515 /gui
parentCopy fast scroll feature to listbox (diff)
downloadandroid_bootable_recovery-f8e2f375656b5ed8e90a501aea4f6925fe7d7d5d.tar
android_bootable_recovery-f8e2f375656b5ed8e90a501aea4f6925fe7d7d5d.tar.gz
android_bootable_recovery-f8e2f375656b5ed8e90a501aea4f6925fe7d7d5d.tar.bz2
android_bootable_recovery-f8e2f375656b5ed8e90a501aea4f6925fe7d7d5d.tar.lz
android_bootable_recovery-f8e2f375656b5ed8e90a501aea4f6925fe7d7d5d.tar.xz
android_bootable_recovery-f8e2f375656b5ed8e90a501aea4f6925fe7d7d5d.tar.zst
android_bootable_recovery-f8e2f375656b5ed8e90a501aea4f6925fe7d7d5d.zip
Diffstat (limited to 'gui')
-rw-r--r--gui/blanktimer.cpp2
-rw-r--r--gui/gui.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/gui/blanktimer.cpp b/gui/blanktimer.cpp
index d991d40b3..cf35f6544 100644
--- a/gui/blanktimer.cpp
+++ b/gui/blanktimer.cpp
@@ -37,6 +37,7 @@ extern "C" {
#include <sstream>
#include "pages.hpp"
#include "blanktimer.hpp"
+#include "../data.hpp"
extern "C" {
#include "../common.h"
#include "../recovery_ui.h"
@@ -46,7 +47,6 @@ extern "C" {
blanktimer::blanktimer(void) {
blanked = 0;
- sleepTimer = 60;
orig_brightness = getBrightness();
}
diff --git a/gui/gui.cpp b/gui/gui.cpp
index 4788fe0df..f08d68be3 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -185,9 +185,12 @@ input_thread (void *cookie)
0, lshift = 0, rshift = 0, key_repeat = 0;
static struct timeval touchStart;
HardwareKeyboard kb;
+ string seconds;
//start screen timeout threads
blankTimer.setTimerThread();
+ DataManager::GetValue("tw_screen_timeout_secs", seconds);
+ blankTimer.setTime(atoi(seconds.c_str()));
for (;;)
{