From 288a851a653e8ef662a7cea952d57bffd6c2fee9 Mon Sep 17 00:00:00 2001
From: fysx <martin@fysx.org>
Date: Tue, 11 Feb 2014 00:42:05 +0100
Subject: [PATCH] fix for the fix for the non-improvement

---
 jni/love/src/common/android.cpp          |  2 +-
 src/org/libsdl/app/SDLActivity.java      |  8 --------
 src/org/love2d/android/GameActivity.java | 11 ++++++++++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/jni/love/src/common/android.cpp b/jni/love/src/common/android.cpp
index f219436a..8c7adcbe 100644
--- a/jni/love/src/common/android.cpp
+++ b/jni/love/src/common/android.cpp
@@ -36,7 +36,7 @@ double getScreenScale()
 
   if (result == -1.) {
     JNIEnv *env = (JNIEnv*) SDL_AndroidGetJNIEnv();
-    jclass activity = env->FindClass("org/libsdl/app/SDLActivity");
+    jclass activity = env->FindClass("org/love2d/android/GameActivity");
 
     jmethodID getMetrics = env->GetStaticMethodID(activity, "getMetrics", "()Landroid/util/DisplayMetrics;");
     jobject metrics = env->CallStaticObjectMethod(activity, getMetrics);
diff --git a/src/org/libsdl/app/SDLActivity.java b/src/org/libsdl/app/SDLActivity.java
index df157e0a..d96c3b2c 100644
--- a/src/org/libsdl/app/SDLActivity.java
+++ b/src/org/libsdl/app/SDLActivity.java
@@ -12,7 +12,6 @@ import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AbsoluteLayout;
 import android.os.*;
-import android.util.DisplayMetrics;
 import android.util.Log;
 import android.graphics.*;
 import android.media.*;
@@ -54,11 +53,6 @@ public class SDLActivity extends Activity {
         System.loadLibrary("love");
     }
 
-    private static DisplayMetrics metrics = new DisplayMetrics();
-    public static DisplayMetrics getMetrics() {
-        return metrics;
-    }
-    
     // Setup
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -85,8 +79,6 @@ public class SDLActivity extends Activity {
         mLayout.addView(mSurface);
 
         setContentView(mLayout);
-        
-        getWindowManager().getDefaultDisplay().getMetrics(metrics);
     }
 
     // Events
diff --git a/src/org/love2d/android/GameActivity.java b/src/org/love2d/android/GameActivity.java
index 76b2d5ef..2f621331 100644
--- a/src/org/love2d/android/GameActivity.java
+++ b/src/org/love2d/android/GameActivity.java
@@ -2,10 +2,19 @@ package org.love2d.android;
 
 import org.libsdl.app.SDLActivity;
 import android.os.Bundle;
+import android.util.DisplayMetrics;
 
 public class GameActivity extends SDLActivity {
-    @Override
+    private static DisplayMetrics metrics = new DisplayMetrics();
+	
+	@Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        
+        getWindowManager().getDefaultDisplay().getMetrics(metrics);
+    }
+    
+    public static DisplayMetrics getMetrics() {
+        return metrics;
     }
 }