diff options
author | Doug Zongker <dougz@google.com> | 2014-03-17 16:13:08 -0700 |
---|---|---|
committer | Doug Zongker <dougz@google.com> | 2014-03-17 16:13:08 -0700 |
commit | c4025e90f4e73bd9bf9665000276663e35c0066b (patch) | |
tree | f103aef739b9715fd1546b060e132a39a071a4af /screen_ui.cpp | |
parent | 52d0b765ab58e7def9783623092f1891a4d7f427 (diff) | |
parent | d90da13076303a5377de631623e16c34ee195830 (diff) | |
download | bootable_recovery-c4025e90f4e73bd9bf9665000276663e35c0066b.zip bootable_recovery-c4025e90f4e73bd9bf9665000276663e35c0066b.tar.gz bootable_recovery-c4025e90f4e73bd9bf9665000276663e35c0066b.tar.bz2 |
resolved conflicts for merge of d90da130 to klp-dev-plus-aosp
Change-Id: I19f9f460145fdcf5cdc58ee4fa25ff3c9ba398f0
Diffstat (limited to 'screen_ui.cpp')
-rw-r--r-- | screen_ui.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp index 86429c9..eddae11 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp @@ -52,6 +52,7 @@ static double now() { ScreenRecoveryUI::ScreenRecoveryUI() : currentIcon(NONE), installingFrame(0), + locale(NULL), rtl_locale(false), progressBarType(EMPTY), progressScopeStart(0), @@ -322,21 +323,21 @@ void ScreenRecoveryUI::progress_loop() { } void ScreenRecoveryUI::LoadBitmap(const char* filename, gr_surface* surface) { - int result = res_create_surface(filename, surface); + int result = res_create_display_surface(filename, surface); if (result < 0) { LOGE("missing bitmap %s\n(Code %d)\n", filename, result); } } void ScreenRecoveryUI::LoadBitmapArray(const char* filename, int* frames, gr_surface** surface) { - int result = res_create_multi_surface(filename, frames, surface); + int result = res_create_multi_display_surface(filename, frames, surface); if (result < 0) { LOGE("missing bitmap %s\n(Code %d)\n", filename, result); } } void ScreenRecoveryUI::LoadLocalizedBitmap(const char* filename, gr_surface* surface) { - int result = res_create_localized_surface(filename, surface); + int result = res_create_localized_alpha_surface(filename, locale, surface); if (result < 0) { LOGE("missing bitmap %s\n(Code %d)\n", filename, result); } @@ -378,8 +379,9 @@ void ScreenRecoveryUI::Init() RecoveryUI::Init(); } -void ScreenRecoveryUI::SetLocale(const char* locale) { - if (locale) { +void ScreenRecoveryUI::SetLocale(const char* new_locale) { + if (new_locale) { + this->locale = new_locale; char* lang = strdup(locale); for (char* p = lang; *p; ++p) { if (*p == '_') { @@ -398,6 +400,8 @@ void ScreenRecoveryUI::SetLocale(const char* locale) { rtl_locale = true; } free(lang); + } else { + new_locale = NULL; } } |