tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Add mechanism for device-specific loop images""

Browse source
This commit is contained in:
Tianjie Xu 2019-12-09 22:33:15 +00:00 committed by Gerrit Code Review
commit fff38d9446
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
recovery_ui/screen_ui.cpp
View file

@ -941,27 +941,17 @@ void ScreenRecoveryUI::LoadAnimation() {
closedir);
dirent* de;
std::vector<std::string> intro_frame_names;
std::vector<std::string> default_loop_frame_names;
std::vector<std::string> device_loop_frame_names;
// Create string format for device-specific loop animations.
std::string deviceformat = android::base::GetProperty("ro.product.product.name", "");
deviceformat += "%d%n.png";
std::vector<std::string> loop_frame_names;
while ((de = readdir(dir.get())) != nullptr) {
int value, num_chars;
if (sscanf(de->d_name, "intro%d%n.png", &value, &num_chars) == 1) {
intro_frame_names.emplace_back(de->d_name, num_chars);
} else if (sscanf(de->d_name, "loop%d%n.png", &value, &num_chars) == 1) {
default_loop_frame_names.emplace_back(de->d_name, num_chars);
} else if (sscanf(de->d_name, deviceformat.c_str(), &value, &num_chars) == 1) {
device_loop_frame_names.emplace_back(de->d_name, num_chars);
loop_frame_names.emplace_back(de->d_name, num_chars);
}
}
// Favor device-specific loop frames, if they exist.
auto& loop_frame_names =
device_loop_frame_names.empty() ? default_loop_frame_names : device_loop_frame_names;
size_t intro_frames = intro_frame_names.size();
size_t loop_frames = loop_frame_names.size();