android/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge

Browse Source 
Change-Id: I25a675887320afd2984523efbc3b7506231ebe4b
This commit is contained in:
Koushik Dutta 2010-07-19 08:43:05 -07:00
commit 702294d5b8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui.c
View File

@ -50,13 +50,8 @@ static int gShowBackButton = 0;
static pthread_mutex_t gUpdateMutex = PTHREAD_MUTEX_INITIALIZER;
static gr_surface gBackgroundIcon[NUM_BACKGROUND_ICONS];
static gr_surface gProgressBarIndeterminate[PROGRESSBAR_INDETERMINATE_STATES];
<<<<<<< HEAD
static gr_surface gProgressBarEmpty;
static gr_surface gProgressBarFill;
=======
static gr_surface gProgressBarEmpty[NUM_SIDES];
static gr_surface gProgressBarFill[NUM_SIDES];
>>>>>>> command line nandroid
static int ui_has_initialized = 0;
static const struct { gr_surface* surface; const char *name; } BITMAPS[] = {
@ -604,4 +599,8 @@ void ui_set_showing_back_button(int showBackButton) {
int ui_get_showing_back_button() {
return gShowBackButton;
<<<<<<< HEAD
}
=======
}
>>>>>>> github/eclair