PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add mechanism for device-specific loop images" am: d81bb36b5b

Browse Source 
am: 5446037552

Change-Id: I5c3afdc9453e9c06fb7f6a51af2503905e83ac9f
This commit is contained in:
Tianjie Xu
2019-12-06 14:56:03 -08:00
committed by android-build-merger
parent 9cc8880f6e 5446037552
commit f165c5c4be
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
recovery_ui/screen_ui.cpp
View File

@@ -941,17 +941,27 @@ void ScreenRecoveryUI::LoadAnimation() {
closedir);
dirent* de;
std::vector<std::string> intro_frame_names;
std::vector<std::string> loop_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";
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) {
loop_frame_names.emplace_back(de->d_name, num_chars);
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);
}
}
// 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();