From fdd297a98291d12ce5d586f899ff9ecca7d2f92f Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Thu, 1 Jan 2015 13:35:31 +0100
Subject: [PATCH] Update native with better Moga version detection. Show moga
 version in System information on Android.

---
 UI/DevScreens.cpp  | 8 ++++++++
 UI/PauseScreen.cpp | 1 +
 native             | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp
index 48082cbd0f..81ced3baef 100644
--- a/UI/DevScreens.cpp
+++ b/UI/DevScreens.cpp
@@ -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));
diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp
index 0edd9a073b..a8893b86b7 100644
--- a/UI/PauseScreen.cpp
+++ b/UI/PauseScreen.cpp
@@ -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)));
 	}
 
diff --git a/native b/native
index 6ec765dcf4..4dce24d05c 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 6ec765dcf4a1dd26c99b39961e487b84eedfcf91
+Subproject commit 4dce24d05cbe02e8bc711698aca01193f1a36433