Update native with better Moga version detection. Show moga version in System information on Android.

This commit is contained in:
Henrik Rydgard 2015-01-01 13:35:31 +01:00
parent 6a7e5d1cc2
commit fdd297a982
3 changed files with 10 additions and 1 deletions

View File

@ -253,6 +253,14 @@ void SystemInfoScreen::CreateViews() {
deviceSpecs->Add(new InfoItem("API Version", apiVersion));
deviceSpecs->Add(new InfoItem("Shading Language", thin3d->GetInfoString(T3DInfo::SHADELANGVERSION)));
#ifdef ANDROID
std::string moga = System_GetProperty(SYSPROP_MOGA_VERSION);
if (moga.empty()) {
moga = "(none detected)";
}
deviceSpecs->Add(new InfoItem("Moga", moga));
#endif
#ifdef ANDROID
char temp[256];
sprintf(temp, "%dx%d", System_GetPropertyInt(SYSPROP_DISPLAY_XRES), System_GetPropertyInt(SYSPROP_DISPLAY_YRES));

View File

@ -124,6 +124,7 @@ protected:
bool ShowButtons() const override { return true; }
virtual void CreatePopupContents(UI::ViewGroup *parent) {
// TODO: Find an appropriate size for the image view
parent->Add(new AsyncImageFileView(filename_, UI::IS_DEFAULT, NULL, new UI::LayoutParams(480, 272)));
}

2
native

@ -1 +1 @@
Subproject commit 6ec765dcf4a1dd26c99b39961e487b84eedfcf91
Subproject commit 4dce24d05cbe02e8bc711698aca01193f1a36433