From 97dc9df075303cb024cfd6280a3a4e6efa2f1426 Mon Sep 17 00:00:00 2001
From: Joshua Granick <joshua@joshuagranick.com>
Date: Wed, 16 Apr 2014 15:39:46 -0700
Subject: [PATCH] Cleanup, compile fix

---
 .../src/org/haxe/lime/GameActivity.java       | 98 +++++++++----------
 1 file changed, 47 insertions(+), 51 deletions(-)

diff --git a/templates/android/template/src/org/haxe/lime/GameActivity.java b/templates/android/template/src/org/haxe/lime/GameActivity.java
index 4a484bc31..2f83b9560 100644
--- a/templates/android/template/src/org/haxe/lime/GameActivity.java
+++ b/templates/android/template/src/org/haxe/lime/GameActivity.java
@@ -98,21 +98,16 @@ public class GameActivity extends Activity implements SensorEventListener {
 		
 		requestWindowFeature (Window.FEATURE_NO_TITLE);
 		
-
 		::if WIN_FULLSCREEN::
- 			::if (ANDROID_TARGET_SDK_VERSION < 19)::
- 				getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN
- 					| WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
- 			::end::
- 		::end::
-
+			::if (ANDROID_TARGET_SDK_VERSION < 19)::
+				getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN
+					| WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+			::end::
+		::end::
 		
 		metrics = new DisplayMetrics ();
 		getWindowManager ().getDefaultDisplay ().getMetrics (metrics);
 		
-	
-		Log.d ("lime", "mMainView is NULL");
-			
 		::foreach ndlls::
 		System.loadLibrary ("::name::");
 		::end::
@@ -120,7 +115,7 @@ public class GameActivity extends Activity implements SensorEventListener {
 		
 		mView = new MainView (getApplication (), this);
 		setContentView (mView);
-
+		
 		Extension.mainView = mView;
 		
 		sensorManager = (SensorManager)activity.getSystemService (Context.SENSOR_SERVICE);
@@ -132,11 +127,11 @@ public class GameActivity extends Activity implements SensorEventListener {
 			
 		}
 		
-		Extension.PACKAGE_NAME = getApplicationContext().getPackageName();
+		Extension.packageName = getApplicationContext ().getPackageName ();
 		
 		if (extensions == null) {
 			
-			extensions = new ArrayList<Extension>();
+			extensions = new ArrayList<Extension> ();
 			::if (ANDROID_EXTENSIONS != null)::::foreach ANDROID_EXTENSIONS::
 			extensions.add (new ::__current__:: ());::end::::end::
 			
@@ -402,19 +397,6 @@ public class GameActivity extends Activity implements SensorEventListener {
 		
 	}
 	
-	@Override
-    	protected void onNewIntent(final Intent intent) {
- 		for (Extension extension : extensions) {
- 			extension.onNewIntent (intent);
- 		}
- 		super.onNewIntent (intent);
-     	}
- 	
- 	@Override 
- 	public void onBackPressed() {
- 		
- 	}
- 
 	
 	@Override protected void onActivityResult (int requestCode, int resultCode, Intent data) {
 		
@@ -449,6 +431,32 @@ public class GameActivity extends Activity implements SensorEventListener {
 	}
 	
 	
+	@Override public void onLowMemory () {
+		
+		super.onLowMemory ();
+		
+		for (Extension extension : extensions) {
+			
+			extension.onLowMemory ();
+			
+		}
+		
+	}
+	
+	
+	@Override protected void onNewIntent (final Intent intent) {
+		
+		for (Extension extension : extensions) {
+			
+			extension.onNewIntent (intent);
+			
+		}
+		
+		super.onNewIntent (intent);
+		
+	}
+	
+	
 	@Override protected void onPause () {
 		
 		doPause ();
@@ -489,31 +497,6 @@ public class GameActivity extends Activity implements SensorEventListener {
 		
 	}
 	
-
-	@Override public void onLowMemory () {
-		
-		super.onLowMemory ();
-
-		for (Extension extension : extensions) {
-			
-			extension.onLowMemory ();
-			
-		}
-	}
-
-
-	@Override public void onTrimMemory (int level) {
-
-		super.onTrimMemory (level);
-
-		for (Extension extension : extensions) {
-			
-			extension.onTrimMemory (level);
-			
-		}
-
-	}
-	
 	
 	@Override public void onSensorChanged (SensorEvent event) {
 		
@@ -571,6 +554,19 @@ public class GameActivity extends Activity implements SensorEventListener {
 	}
 	
 	
+	@Override public void onTrimMemory (int level) {
+		
+		super.onTrimMemory (level);
+		
+		for (Extension extension : extensions) {
+			
+			extension.onTrimMemory (level);
+			
+		}
+		
+	}
+	
+	
 	public static void popView () {
 		
 		activity.setContentView (activity.mView);