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

Merge AOSP android-9.0.0_r3

Browse Source 
Fix conflicts and make it build in 5.1, 6.0, 7.1, 8.1, and 9.0

Change-Id: Ida0a64c29ff27d339b7f42a18d820930964ac6e4
This commit is contained in:
Ethan Yonker
2018-08-24 11:17:36 -05:00
parent 32aef7a2cf 896de5423d
commit 58f2132bc3
208 changed files with 9097 additions and 4512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/fileselector.cpp
+11 -2
View File
@@ -112,8 +112,17 @@ GUIFileSelector::GUIFileSelector(xml_node<>* node) : GUIScrollList(node)
mFolderIcon = LoadAttrImage(child, "folder");
mFileIcon = LoadAttrImage(child, "file");
}
int iconWidth = std::max(mFolderIcon->GetWidth(), mFileIcon->GetWidth());
int iconHeight = std::max(mFolderIcon->GetHeight(), mFileIcon->GetHeight());
int iconWidth = 0, iconHeight = 0;
if (mFolderIcon && mFolderIcon->GetResource() && mFileIcon && mFileIcon->GetResource()) {
iconWidth = std::max(mFolderIcon->GetWidth(), mFileIcon->GetWidth());
iconHeight = std::max(mFolderIcon->GetHeight(), mFileIcon->GetHeight());
} else if (mFolderIcon && mFolderIcon->GetResource()) {
iconWidth = mFolderIcon->GetWidth();
iconHeight = mFolderIcon->GetHeight();
} else if (mFileIcon && mFileIcon->GetResource()) {
iconWidth = mFileIcon->GetWidth();
iconHeight = mFileIcon->GetHeight();
}
SetMaxIconSize(iconWidth, iconHeight);
// Fetch the file/folder list