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/partitionlist.cpp
+11 -2
View File
@@ -58,8 +58,17 @@ GUIPartitionList::GUIPartitionList(xml_node<>* node) : GUIScrollList(node)
selectedList = attr->value();
}
int iconWidth = std::max(mIconSelected->GetWidth(), mIconUnselected->GetWidth());
int iconHeight = std::max(mIconSelected->GetHeight(), mIconUnselected->GetHeight());
int iconWidth = 0, iconHeight = 0;
if (mIconSelected && mIconSelected->GetResource() && mIconUnselected && mIconUnselected->GetResource()) {
iconWidth = std::max(mIconSelected->GetWidth(), mIconUnselected->GetWidth());
iconHeight = std::max(mIconSelected->GetHeight(), mIconUnselected->GetHeight());
} else if (mIconSelected && mIconSelected->GetResource()) {
iconWidth = mIconSelected->GetWidth();
iconHeight = mIconSelected->GetHeight();
} else if (mIconUnselected && mIconUnselected->GetResource()) {
iconWidth = mIconUnselected->GetWidth();
iconHeight = mIconUnselected->GetHeight();
}
SetMaxIconSize(iconWidth, iconHeight);
child = FindNode(node, "listtype");