From 0e7d88613a8a455de0ebb5446a0bda1372052825 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Wed, 16 Nov 2011 16:47:53 -0800 Subject: [PATCH] Support custom graphics.c. Set the recovery timeout to 1 hour. --- Android.mk | 2 +- minui/Android.mk | 7 ++++++- ui.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index dfe4d16..6db6865 100644 --- a/Android.mk +++ b/Android.mk @@ -34,7 +34,7 @@ else RECOVERY_NAME := CWM-based Recovery endif -RECOVERY_VERSION := $(RECOVERY_NAME) v5.0.2.7 +RECOVERY_VERSION := $(RECOVERY_NAME) v5.5.0.0 LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)" RECOVERY_API_VERSION := 2 diff --git a/minui/Android.mk b/minui/Android.mk index 4c4d7c7..7096354 100644 --- a/minui/Android.mk +++ b/minui/Android.mk @@ -1,7 +1,12 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES := graphics.c events.c resources.c +LOCAL_SRC_FILES := events.c resources.c +ifneq ($(BOARD_CUSTOM_GRAPHICS),) + LOCAL_SRC_FILES += $(BOARD_CUSTOM_GRAPHICS) +else + LOCAL_SRC_FILES += graphics.c +endif LOCAL_C_INCLUDES +=\ external/libpng\ diff --git a/ui.c b/ui.c index 5a9895e..1df42ad 100644 --- a/ui.c +++ b/ui.c @@ -55,7 +55,7 @@ static int gShowBackButton = 0; #define CHAR_HEIGHT 16 #endif -#define UI_WAIT_KEY_TIMEOUT_SEC 120 +#define UI_WAIT_KEY_TIMEOUT_SEC 3600 UIParameters ui_parameters = { 6, // indeterminate progress bar frames