From a13e1ff2c4c3887d71b85f7dc0ad6d2641fb27f5 Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Fri, 10 Feb 2012 12:12:21 -0800
Subject: [PATCH 01/17] Added ScriptingExample.

---
 assets/js/scriptingexample.js                 |  33 ++++
 assets/js/scriptingexample_rhino.js           | 126 ++++++++++++
 res/layout/scriptingexample.xml               |  29 +++
 .../andengine/examples/ScriptingExample.java  | 179 ++++++++++++++++++
 .../andengine/examples/launcher/Example.java  |   2 +
 .../examples/launcher/ExampleGroup.java       |   2 +-
 6 files changed, 370 insertions(+), 1 deletion(-)
 create mode 100644 assets/js/scriptingexample.js
 create mode 100644 assets/js/scriptingexample_rhino.js
 create mode 100644 res/layout/scriptingexample.xml
 create mode 100644 src/org/andengine/examples/ScriptingExample.java

diff --git a/assets/js/scriptingexample.js b/assets/js/scriptingexample.js
new file mode 100644
index 0000000..55bd788
--- /dev/null
+++ b/assets/js/scriptingexample.js
@@ -0,0 +1,33 @@
+var scaleUp = true;
+
+function onUpdate(pSecondsElapsed) {
+    mSprite.setRotation(mSprite.getRotation() + 90 * pSecondsElapsed);
+
+    var scale = mSprite.getScaleX();
+    if(scaleUp) {
+        if(scale < 2) {
+            mSprite.setScale(scale + 1 * pSecondsElapsed);
+        } else {
+            scaleUp = false;        
+        }
+    } else {
+        if(scale > 1) {
+            mSprite.setScale(scale - 2 * pSecondsElapsed);
+        } else {
+            scaleUp = true;        
+        }
+    }
+}
+
+//function onClick() {
+//    var widgets = Packages.android.widget;
+//    var view = new widgets.TextView(mContext);
+//    mContext.setContentView(view);
+//    var text = 'Hello Android!\\nThis is JavaScript in action!';
+//    view.append(text);
+//    if(mSprite.isAnimationRunning()) {
+//        mSprite.stopAnimation();
+//    } else {
+//        mSprite.animate(100);
+//    }
+//}
diff --git a/assets/js/scriptingexample_rhino.js b/assets/js/scriptingexample_rhino.js
new file mode 100644
index 0000000..2918a74
--- /dev/null
+++ b/assets/js/scriptingexample_rhino.js
@@ -0,0 +1,126 @@
+var AndEnginePackages = JavaImporter(
+	// ###########
+	// ENGINE
+	// ###########
+
+	// Widgets
+	Packages.android.widget,
+
+	// ###########
+	// ENGINE
+	// ###########
+
+	// Engine
+	Packages.org.andengine.engine,
+	Packages.org.andengine.engine.options,
+
+	// Handlers
+	Packages.org.andengine.engine.handler,
+	Packages.org.andengine.engine.handler.collision,
+	Packages.org.andengine.engine.handler.physics,
+	Packages.org.andengine.engine.handler.runnable,
+	Packages.org.andengine.engine.handler.timer,
+	
+	// Camera
+	Packages.org.andengine.engine.camera,
+	
+	// Touch
+	Packages.org.andengine.input.touch,
+	Packages.org.andengine.input.touch.controller,
+	Packages.org.andengine.input.touch.detector,
+
+	// ###########
+	// OPENGL
+	// ###########
+
+	// Textures
+	Packages.org.andengine.opengl.texture,
+	Packages.org.andengine.opengl.texture.atlas,
+	Packages.org.andengine.opengl.texture.atlas.bitmap,
+	Packages.org.andengine.opengl.texture.atlas.bitmap.source,
+	Packages.org.andengine.opengl.texture.atlas.buildable,
+	Packages.org.andengine.opengl.texture.bitmap,
+	Packages.org.andengine.opengl.texture.compressed.etc1,
+	Packages.org.andengine.opengl.texture.compressed.pvr,
+	Packages.org.andengine.opengl.texture.region,
+	Packages.org.andengine.opengl.texture.render,
+
+	// Util
+	Packages.org.andengine.opengl.texture.util,
+	
+	// ###########
+	// ENTITY
+	// ###########
+
+	// Entity
+	Packages.org.andengine.entity.sprite,
+	Packages.org.andengine.entity.primitive,
+	Packages.org.andengine.entity.scene,
+	Packages.org.andengine.entity.shape,
+	Packages.org.andengine.entity.sprite,
+	Packages.org.andengine.entity.sprite.batch,
+	Packages.org.andengine.entity.text,
+
+	// Modifier
+	Packages.org.andengine.entity.modifier,
+	Packages.org.andengine.util.modifier.ease,
+
+	// Util
+	Packages.org.andengine.entity.util,
+	
+	// ###########
+	// UTIL
+	// ###########
+	Packages.org.andengine.util,
+	Packages.org.andengine.util.math,
+	Packages.org.andengine.util.spatial,
+	Packages.org.andengine.util.spatial.adt.bounds,
+	Packages.org.andengine.util.spatial.adt.bounds.util,
+	Packages.org.andengine.util.spatial.quadtree,
+
+	Packages.android.graphics
+);
+
+with(AndEnginePackages) {
+	var engine = mContext.getEngine();
+	var scene = engine.getScene();
+	var camera = engine.getCamera();
+	
+	var size = 100;
+	
+	var x = MathUtils.random(0, camera.getWidth()) - size / 2;
+	var y = MathUtils.random(0, camera.getHeight()) - size / 2;
+
+	/*
+	var rectangle = new Rectangle(x, y, size, size, engine.getVertexBufferObjectManager());
+	*/
+
+	var bounds = new AbstractIntBounds(0, 1, 2, 3) {
+		getXMin: function() {
+			return 4;
+		}
+	}
+
+	var point = new AbstractPoint(0, 1) {
+		set: function(pX, pY) {
+			return;
+		}
+	}
+
+	var rectangle = new AbstractRectangle(x, y, size, size, engine.getVertexBufferObjectManager()) {
+		onAreaTouched: function(pSceneTouchEvent, pTouchAreaLocalX, pTouchAreaLocalY) {
+			pTouchArea.setColor(1, 1, 0, 1);
+		}
+	};
+
+	rectangle.setColor(1, 0, 0, 1);
+	scene.attachChild(rectangle);
+	scene.registerTouchArea(rectangle);
+	scene.setOnAreaTouchListener(new Packages.org.andengine.entity.scene.Scene.IOnAreaTouchListener() {
+		onAreaTouched: function(pSceneTouchEvent, pTouchArea, pTouchAreaLocalX, pTouchAreaLocalY) {
+			pTouchArea.setColor(0, 1, 0, 1);
+			pTouchArea.registerEntityModifier(new LoopEntityModifier(new RotationModifier(6, 0, 360, EaseExponentialInOut.getInstance())));
+			return true;
+		}
+	});
+}
diff --git a/res/layout/scriptingexample.xml b/res/layout/scriptingexample.xml
new file mode 100644
index 0000000..71e4c89
--- /dev/null
+++ b/res/layout/scriptingexample.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout  xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" 
+	android:layout_height="fill_parent"
+	android:orientation="vertical">
+	<org.andengine.opengl.view.RenderSurfaceView android:id="@+id/scriptingexample_rendersurfaceview"
+		android:layout_width="fill_parent" 
+		android:layout_height="320dp"
+		android:layout_gravity="center"/>
+
+	<LinearLayout 
+		android:layout_width="fill_parent" 
+		android:layout_height="fill_parent"
+		android:orientation="horizontal">
+		<EditText android:id="@+id/scriptingexample_code"
+			android:layout_width="0dp" 
+			android:layout_height="fill_parent"
+			android:layout_weight="1"
+			android:gravity="left"
+			android:textSize="12sp"
+			android:singleLine="false"
+			android:hint="@string/scriptingexample_code_hint"/>
+		<Button android:id="@+id/scriptingexample_code_apply"
+			android:layout_width="wrap_content" 
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:text="@string/scriptingexample_code_apply"/>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/src/org/andengine/examples/ScriptingExample.java b/src/org/andengine/examples/ScriptingExample.java
new file mode 100644
index 0000000..129d2c7
--- /dev/null
+++ b/src/org/andengine/examples/ScriptingExample.java
@@ -0,0 +1,179 @@
+package org.andengine.examples;
+
+import java.io.IOException;
+
+import org.andengine.engine.Engine.EngineLock;
+import org.andengine.engine.camera.Camera;
+import org.andengine.engine.options.EngineOptions;
+import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
+import org.andengine.entity.scene.Scene;
+import org.andengine.entity.scene.background.Background;
+import org.andengine.entity.util.FPSLogger;
+import org.andengine.ui.activity.SimpleLayoutGameActivity;
+import org.andengine.util.StreamUtils;
+import org.andengine.util.debug.Debug;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.ImporterTopLevel;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.EditText;
+import android.widget.Toast;
+
+/**
+ * (c) 2010 Nicolas Gramlich
+ * (c) 2011 Zynga
+ *
+ * @author Nicolas Gramlich
+ * @since 11:54:51 - 03.04.2010
+ */
+public class ScriptingExample extends SimpleLayoutGameActivity implements OnClickListener {
+	// ===========================================================
+	// Constants
+	// ===========================================================
+
+	private static final int CAMERA_WIDTH = 720;
+	private static final int CAMERA_HEIGHT = 480;
+
+	// ===========================================================
+	// Fields
+	// ===========================================================
+
+	private EditText mEditTextCode;
+
+	private Context mJavascriptContext;
+	private Scriptable mJavascriptScope;
+
+	// ===========================================================
+	// Constructors
+	// ===========================================================
+
+	// ===========================================================
+	// Getter & Setter
+	// ===========================================================
+
+	// ===========================================================
+	// Methods for/from SuperClass/Interfaces
+	// ===========================================================
+
+	@Override
+	protected int getLayoutID() {
+		return R.layout.scriptingexample;
+	}
+
+	@Override
+	protected int getRenderSurfaceViewID() {
+		return R.id.scriptingexample_rendersurfaceview;
+	}
+
+	@Override
+	public EngineOptions onCreateEngineOptions() {
+		final Camera camera = new Camera(0, 0, ScriptingExample.CAMERA_WIDTH, ScriptingExample.CAMERA_HEIGHT);
+
+		return new EngineOptions(true, ScreenOrientation.PORTRAIT_FIXED, new RatioResolutionPolicy(ScriptingExample.CAMERA_WIDTH, ScriptingExample.CAMERA_HEIGHT), camera);
+	}
+
+	@Override
+	protected void onSetContentView() {
+		super.onSetContentView();
+
+		this.mEditTextCode = (EditText) this.findViewById(R.id.scriptingexample_code);
+		try {
+			this.mEditTextCode.setText(StreamUtils.readFully(this.getAssets().open("js/scriptingexample_rhino.js")));
+		} catch (final IOException e) {
+			Debug.e(e);
+		}
+		this.findViewById(R.id.scriptingexample_code_apply).setOnClickListener(this);
+	}
+
+	@Override
+	public void onCreateResources() {
+		this.runOnUpdateThread(new Runnable() {
+			@Override
+			public void run() {
+				final EngineLock engineLock = ScriptingExample.this.mEngine.getEngineLock();
+				engineLock.lock();
+
+				ScriptingExample.this.mJavascriptContext = Context.enter();
+
+				/* Turn off optimization (bytecode-generation). */
+				ScriptingExample.this.mJavascriptContext.setOptimizationLevel(-1);
+
+				ScriptingExample.this.mJavascriptScope = new ImporterTopLevel(ScriptingExample.this.mJavascriptContext);
+
+				// Set a global variable that holds the activity instance.
+				ScriptableObject.putProperty(ScriptingExample.this.mJavascriptScope, "mContext", Context.javaToJS(ScriptingExample.this, ScriptingExample.this.mJavascriptScope));
+
+				engineLock.unlock();
+			}
+		});
+	}
+
+	@Override
+	public Scene onCreateScene() {
+		this.mEngine.registerUpdateHandler(new FPSLogger());
+
+		final Scene scene = new Scene();
+		scene.setOnAreaTouchTraversalFrontToBack();
+		scene.setBackground(new Background(1, 1, 1, 1));
+
+		return scene;
+	}
+
+	@Override
+	public void onDestroyResources() throws Exception {
+//		this.runOnUpdateThread(new Runnable() {
+//			@Override
+//			public void run() {
+//				final EngineLock engineLock = ScriptingExample.this.mEngine.getEngineLock();
+//				engineLock.lock();
+//
+//				Context.exit();
+//
+//				engineLock.unlock();
+//			}
+//		});
+
+		super.onDestroyResources();
+	}
+
+	@Override
+	public void onClick(final View pView) {
+		switch(pView.getId()) {
+			case R.id.scriptingexample_code_apply:
+				this.applyCodeOnUpdateThread();
+		}
+	}
+
+	void applyCodeOnUpdateThread() {
+		final String code = this.mEditTextCode.getText().toString();
+
+		this.runOnUpdateThread(new Runnable() {
+			@Override
+			public void run() {
+				try {
+					ScriptingExample.this.mJavascriptContext.evaluateString(ScriptingExample.this.mJavascriptScope, code, "<code>", 1, null);
+				} catch (final Throwable t) {
+					ScriptingExample.this.runOnUiThread(new Runnable() {
+						@Override
+						public void run() {
+							Toast.makeText(ScriptingExample.this, t.getMessage(), Toast.LENGTH_SHORT).show();
+						}
+					});
+					Debug.e(t);
+				}
+			}
+		});
+	}
+
+	// ===========================================================
+	// Methods
+	// ===========================================================
+
+	// ===========================================================
+	// Inner and Anonymous Classes
+	// ===========================================================
+}
diff --git a/src/org/andengine/examples/launcher/Example.java b/src/org/andengine/examples/launcher/Example.java
index 895b781..52526b4 100644
--- a/src/org/andengine/examples/launcher/Example.java
+++ b/src/org/andengine/examples/launcher/Example.java
@@ -53,6 +53,7 @@
 import org.andengine.examples.RunnablePoolUpdateHandlerExample;
 import org.andengine.examples.SVGTextureRegionExample;
 import org.andengine.examples.ScreenCaptureExample;
+import org.andengine.examples.ScriptingExample;
 import org.andengine.examples.SoundExample;
 import org.andengine.examples.SplitScreenExample;
 import org.andengine.examples.SpriteBatchExample;
@@ -149,6 +150,7 @@ enum Example {
 	ROTATION3D(Rotation3DExample.class, R.string.example_rotation3d),
 	RUNNABLEPOOLUPDATEHANDLER(RunnablePoolUpdateHandlerExample.class, R.string.example_runnablepoolupdatehandler),
 	SCREENCAPTURE(ScreenCaptureExample.class, R.string.example_screencapture),
+	SCRIPTING(ScriptingExample.class, R.string.example_scripting),
 	SOUND(SoundExample.class, R.string.example_sound),
 	SPLITSCREEN(SplitScreenExample.class, R.string.example_splitscreen),
 	SPRITEBATCH(SpriteBatchExample.class, R.string.example_spritebatch),
diff --git a/src/org/andengine/examples/launcher/ExampleGroup.java b/src/org/andengine/examples/launcher/ExampleGroup.java
index b5d90e8..594d6b8 100644
--- a/src/org/andengine/examples/launcher/ExampleGroup.java
+++ b/src/org/andengine/examples/launcher/ExampleGroup.java
@@ -32,7 +32,7 @@ public enum ExampleGroup {
 	AUDIO(R.string.examplegroup_audio, 
 			Example.SOUND, Example.MUSIC, Example.MODPLAYER),
 	ADVANCED(R.string.examplegroup_advanced, 
-			Example.SPLITSCREEN, Example.BOUNDCAMERA), // Example.AUGMENTEDREALITY, Example.AUGMENTEDREALITYHORIZON),
+			Example.SPLITSCREEN, Example.BOUNDCAMERA, Example.SCRIPTING), // Example.AUGMENTEDREALITY, Example.AUGMENTEDREALITYHORIZON),
 	POSTPROCESSING(R.string.examplegroup_postprocessing, 
 			Example.MOTIONSTREAK, Example.RADIALBLUR),
 	BACKGROUND(R.string.examplegroup_background, 

From 9ef94b71bf50cd4cfbbf2ac00da5a083f1fe1414 Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Fri, 10 Feb 2012 12:15:11 -0800
Subject: [PATCH 02/17] Updated AndroidManifest.xml and strings.xml.

---
 AndroidManifest.xml    | 1 +
 res/values/strings.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e15e242..728de4d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -82,6 +82,7 @@
 		<activity android:name=".Rotation3DExample" android:configChanges="orientation"/>
 		<activity android:name=".RunnablePoolUpdateHandlerExample" android:configChanges="orientation"/>
 		<activity android:name=".ScreenCaptureExample" android:configChanges="orientation"/>
+		<activity android:name=".ScriptingExample" android:configChanges="orientation" android:windowSoftInputMode="stateVisible|adjustPan"/>
 		<activity android:name=".SoundExample" android:configChanges="orientation"/>
 		<activity android:name=".SplitScreenExample" android:configChanges="orientation"/>
 		<activity android:name=".SpriteBatchExample" android:configChanges="orientation"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4921fa5..46fd228 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -98,6 +98,7 @@
 	<string name="example_rotation3d">Rotating in 3D</string>
 	<string name="example_runnablepoolupdatehandler">Using RunnablePoolUpdateHandlers</string>
 	<string name="example_screencapture">Capturing the Screen (Screenshot)</string>
+	<string name="example_scripting">Scripting</string>
 	<string name="example_sound">Playing Sound</string>
 	<string name="example_splitscreen">Using a SplitScreen</string>
 	<string name="example_spritebatch">Drawing a SpriteBatch</string>

From 1903a99755a17113e55cc1aa2ba6277ba51bbd13 Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Tue, 21 Feb 2012 13:42:59 -0800
Subject: [PATCH 03/17] Added missing string resources.

---
 res/values/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index cb02ab9..15eb6a3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -22,6 +22,9 @@
 	<string name="tv_xmllayoutexample_below">Lorem ipsum dolor sit amat...</string>
 
 	<string name="textbreakexample_text_default">Hello, World!</string>
+	
+	<string name="scriptingexample_code_hint">Enter code here...</string>
+	<string name="scriptingexample_code_apply">Apply</string>
 
     <!-- Example-Groups -->
     <string name="examplegroup_simple">Simple</string>

From 05a5b199f7b15e66a788fd7a64ed096171eb19ae Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Wed, 22 Feb 2012 18:16:09 -0800
Subject: [PATCH 04/17] Updated TextBreakExample.

---
 src/org/andengine/examples/TextBreakExample.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/org/andengine/examples/TextBreakExample.java b/src/org/andengine/examples/TextBreakExample.java
index 4dfdcdf..3170bf3 100644
--- a/src/org/andengine/examples/TextBreakExample.java
+++ b/src/org/andengine/examples/TextBreakExample.java
@@ -9,6 +9,7 @@
 import org.andengine.entity.scene.background.Background;
 import org.andengine.entity.text.Text;
 import org.andengine.entity.text.Text.TextOptions;
+import org.andengine.entity.text.Text.TextOptions.AutoWrap;
 import org.andengine.entity.util.FPSLogger;
 import org.andengine.opengl.font.Font;
 import org.andengine.opengl.font.FontFactory;
@@ -102,7 +103,7 @@ public Scene onCreateScene() {
 		scene.setBackground(new Background(0.09804f, 0.6274f, 0.8784f));
 
 		final VertexBufferObjectManager vertexBufferObjectManager = this.getVertexBufferObjectManager();
-		this.mText = new Text(50, 40, this.mFont, "", 1000, new TextOptions(true, AUTOWRAP_WIDTH, Text.LEADING_DEFAULT, HorizontalAlign.CENTER), vertexBufferObjectManager);
+		this.mText = new Text(50, 40, this.mFont, "", 1000, new TextOptions(AutoWrap.LETTERS, AUTOWRAP_WIDTH, Text.LEADING_DEFAULT, HorizontalAlign.CENTER), vertexBufferObjectManager);
 		scene.attachChild(this.mText);
 
 		this.mLeft = new Line(0, 0, 0, TextBreakExample.CAMERA_HEIGHT, this.getVertexBufferObjectManager());

From 0d8047b5b86d32d8c35e5a6d8f0d5d6b4bbecbe7 Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Wed, 29 Feb 2012 16:31:36 -0800
Subject: [PATCH 05/17] ScriptingExample now using GLES2-JavaScriptCore branch
 of AndEngineScriptingExtension.

---
 .../andengine/examples/ScriptingExample.java  | 97 ++++---------------
 1 file changed, 18 insertions(+), 79 deletions(-)

diff --git a/src/org/andengine/examples/ScriptingExample.java b/src/org/andengine/examples/ScriptingExample.java
index 129d2c7..b52f967 100644
--- a/src/org/andengine/examples/ScriptingExample.java
+++ b/src/org/andengine/examples/ScriptingExample.java
@@ -1,27 +1,23 @@
 package org.andengine.examples;
 
-import java.io.IOException;
-
-import org.andengine.engine.Engine.EngineLock;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
 import org.andengine.engine.options.EngineOptions.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
+import org.andengine.entity.IEntity;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
 import org.andengine.entity.util.FPSLogger;
+import org.andengine.extension.scripting.ScriptingEnvironment;
+import org.andengine.extension.scripting.Test;
 import org.andengine.ui.activity.SimpleLayoutGameActivity;
-import org.andengine.util.StreamUtils;
 import org.andengine.util.debug.Debug;
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.ImporterTopLevel;
-import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.ScriptableObject;
+import org.andengine.util.system.SystemUtils;
 
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.EditText;
-import android.widget.Toast;
 
 /**
  * (c) 2010 Nicolas Gramlich
@@ -44,9 +40,6 @@ public class ScriptingExample extends SimpleLayoutGameActivity implements OnClic
 
 	private EditText mEditTextCode;
 
-	private Context mJavascriptContext;
-	private Scriptable mJavascriptScope;
-
 	// ===========================================================
 	// Constructors
 	// ===========================================================
@@ -59,6 +52,9 @@ public class ScriptingExample extends SimpleLayoutGameActivity implements OnClic
 	// Methods for/from SuperClass/Interfaces
 	// ===========================================================
 
+//	public static native String stringFromJNI();
+//	public static native String unimplementedStringFromJNI();
+
 	@Override
 	protected int getLayoutID() {
 		return R.layout.scriptingexample;
@@ -81,35 +77,17 @@ protected void onSetContentView() {
 		super.onSetContentView();
 
 		this.mEditTextCode = (EditText) this.findViewById(R.id.scriptingexample_code);
-		try {
-			this.mEditTextCode.setText(StreamUtils.readFully(this.getAssets().open("js/scriptingexample_rhino.js")));
-		} catch (final IOException e) {
-			Debug.e(e);
-		}
+		this.mEditTextCode.setText("p00p");
 		this.findViewById(R.id.scriptingexample_code_apply).setOnClickListener(this);
 	}
 
 	@Override
 	public void onCreateResources() {
-		this.runOnUpdateThread(new Runnable() {
-			@Override
-			public void run() {
-				final EngineLock engineLock = ScriptingExample.this.mEngine.getEngineLock();
-				engineLock.lock();
-
-				ScriptingExample.this.mJavascriptContext = Context.enter();
-
-				/* Turn off optimization (bytecode-generation). */
-				ScriptingExample.this.mJavascriptContext.setOptimizationLevel(-1);
-
-				ScriptingExample.this.mJavascriptScope = new ImporterTopLevel(ScriptingExample.this.mJavascriptContext);
-
-				// Set a global variable that holds the activity instance.
-				ScriptableObject.putProperty(ScriptingExample.this.mJavascriptScope, "mContext", Context.javaToJS(ScriptingExample.this, ScriptingExample.this.mJavascriptScope));
-
-				engineLock.unlock();
-			}
-		});
+		try {
+			ScriptingEnvironment.init(SystemUtils.getApkFilePath(this), this.getEngine());
+		} catch (NameNotFoundException e) {
+			Debug.e(e);
+		}
 	}
 
 	@Override
@@ -118,55 +96,16 @@ public Scene onCreateScene() {
 
 		final Scene scene = new Scene();
 		scene.setOnAreaTouchTraversalFrontToBack();
-		scene.setBackground(new Background(1, 1, 1, 1));
+		scene.setBackground(new Background(1, 0, 0, 1));
 
-		return scene;
-	}
+		scene.attachChild((IEntity)Test.test());
 
-	@Override
-	public void onDestroyResources() throws Exception {
-//		this.runOnUpdateThread(new Runnable() {
-//			@Override
-//			public void run() {
-//				final EngineLock engineLock = ScriptingExample.this.mEngine.getEngineLock();
-//				engineLock.lock();
-//
-//				Context.exit();
-//
-//				engineLock.unlock();
-//			}
-//		});
-
-		super.onDestroyResources();
+		return scene;
 	}
 
 	@Override
 	public void onClick(final View pView) {
-		switch(pView.getId()) {
-			case R.id.scriptingexample_code_apply:
-				this.applyCodeOnUpdateThread();
-		}
-	}
-
-	void applyCodeOnUpdateThread() {
-		final String code = this.mEditTextCode.getText().toString();
-
-		this.runOnUpdateThread(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					ScriptingExample.this.mJavascriptContext.evaluateString(ScriptingExample.this.mJavascriptScope, code, "<code>", 1, null);
-				} catch (final Throwable t) {
-					ScriptingExample.this.runOnUiThread(new Runnable() {
-						@Override
-						public void run() {
-							Toast.makeText(ScriptingExample.this, t.getMessage(), Toast.LENGTH_SHORT).show();
-						}
-					});
-					Debug.e(t);
-				}
-			}
-		});
+		/* Do sth. */
 	}
 
 	// ===========================================================

From e97e0d5779c840bd20e94f65a0e305011ef5f6f0 Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Mon, 5 Mar 2012 20:13:14 -0800
Subject: [PATCH 06/17] Minor changes due to AndEngine changes.

---
 src/org/andengine/examples/SpriteExample.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/org/andengine/examples/SpriteExample.java b/src/org/andengine/examples/SpriteExample.java
index ae146a3..1e368be 100644
--- a/src/org/andengine/examples/SpriteExample.java
+++ b/src/org/andengine/examples/SpriteExample.java
@@ -18,6 +18,7 @@
 import org.andengine.opengl.texture.region.ITextureRegion;
 import org.andengine.opengl.texture.region.TextureRegionFactory;
 import org.andengine.ui.activity.SimpleBaseGameActivity;
+import org.andengine.util.adt.io.in.IInputStreamOpener;
 import org.andengine.util.debug.Debug;
 
 import android.widget.Toast;
@@ -66,12 +67,12 @@ public EngineOptions onCreateEngineOptions() {
 	@Override
 	public void onCreateResources() {
 		try {
-			this.mTexture = new BitmapTexture(this.getTextureManager()) {
+			this.mTexture = new BitmapTexture(this.getTextureManager(), new IInputStreamOpener() {
 				@Override
-				protected InputStream onGetInputStream() throws IOException {
+				public InputStream open() throws IOException {
 					return getAssets().open("gfx/face_box.png");
 				}
-			};
+			});
 
 			this.mTexture.load();
 			this.mFaceTextureRegion = TextureRegionFactory.extractFromTexture(this.mTexture);

From 3e71933bbb57eaaf892ae8c56e885a21d108b71a Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Mon, 5 Mar 2012 20:13:29 -0800
Subject: [PATCH 07/17] Updated ScriptingExample.

---
 .../andengine/examples/ScriptingExample.java  | 69 ++++++++++++++-----
 1 file changed, 52 insertions(+), 17 deletions(-)

diff --git a/src/org/andengine/examples/ScriptingExample.java b/src/org/andengine/examples/ScriptingExample.java
index b52f967..8fcb38c 100644
--- a/src/org/andengine/examples/ScriptingExample.java
+++ b/src/org/andengine/examples/ScriptingExample.java
@@ -1,20 +1,28 @@
 package org.andengine.examples;
 
+import java.io.IOException;
+
+import org.andengine.engine.Engine;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
 import org.andengine.engine.options.EngineOptions.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
-import org.andengine.entity.IEntity;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
+import org.andengine.entity.sprite.Sprite;
 import org.andengine.entity.util.FPSLogger;
 import org.andengine.extension.scripting.ScriptingEnvironment;
 import org.andengine.extension.scripting.Test;
-import org.andengine.ui.activity.SimpleLayoutGameActivity;
+import org.andengine.opengl.texture.ITexture;
+import org.andengine.opengl.texture.bitmap.AssetBitmapTexture;
+import org.andengine.opengl.texture.region.ITextureRegion;
+import org.andengine.opengl.texture.region.TextureRegionFactory;
+import org.andengine.ui.activity.LayoutGameActivity;
 import org.andengine.util.debug.Debug;
 import org.andengine.util.system.SystemUtils;
 
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.EditText;
@@ -26,11 +34,17 @@
  * @author Nicolas Gramlich
  * @since 11:54:51 - 03.04.2010
  */
-public class ScriptingExample extends SimpleLayoutGameActivity implements OnClickListener {
+public class ScriptingExample extends LayoutGameActivity implements OnClickListener {
 	// ===========================================================
 	// Constants
 	// ===========================================================
 
+	static {
+		System.loadLibrary("gnustl_shared");
+//		System.loadLibrary("js");
+		System.loadLibrary("andenginescriptingextension");
+	}
+
 	private static final int CAMERA_WIDTH = 720;
 	private static final int CAMERA_HEIGHT = 480;
 
@@ -44,6 +58,18 @@ public class ScriptingExample extends SimpleLayoutGameActivity implements OnClic
 	// Constructors
 	// ===========================================================
 
+	@Override
+	protected void onCreate(Bundle pSavedInstanceState) {
+		try {
+			final String apkFilePath = SystemUtils.getApkFilePath(this);
+			ScriptingEnvironment.init(this, apkFilePath);
+		} catch (final NameNotFoundException e) {
+			Debug.e(e);
+		}
+
+		super.onCreate(pSavedInstanceState);
+	}
+
 	// ===========================================================
 	// Getter & Setter
 	// ===========================================================
@@ -52,9 +78,6 @@ public class ScriptingExample extends SimpleLayoutGameActivity implements OnClic
 	// Methods for/from SuperClass/Interfaces
 	// ===========================================================
 
-//	public static native String stringFromJNI();
-//	public static native String unimplementedStringFromJNI();
-
 	@Override
 	protected int getLayoutID() {
 		return R.layout.scriptingexample;
@@ -72,35 +95,47 @@ public EngineOptions onCreateEngineOptions() {
 		return new EngineOptions(true, ScreenOrientation.PORTRAIT_FIXED, new RatioResolutionPolicy(ScriptingExample.CAMERA_WIDTH, ScriptingExample.CAMERA_HEIGHT), camera);
 	}
 
+	@Override
+	public Engine onCreateEngine(final EngineOptions pEngineOptions) {
+		return ScriptingEnvironment.onCreateEngine(pEngineOptions);
+	}
+
 	@Override
 	protected void onSetContentView() {
 		super.onSetContentView();
 
 		this.mEditTextCode = (EditText) this.findViewById(R.id.scriptingexample_code);
-		this.mEditTextCode.setText("p00p");
+		try {
+			this.mEditTextCode.setText(SystemUtils.getApkFilePath(this));
+		} catch (final NameNotFoundException e) {
+			Debug.e(e);
+		}
 		this.findViewById(R.id.scriptingexample_code_apply).setOnClickListener(this);
 	}
 
 	@Override
-	public void onCreateResources() {
-		try {
-			ScriptingEnvironment.init(SystemUtils.getApkFilePath(this), this.getEngine());
-		} catch (NameNotFoundException e) {
-			Debug.e(e);
-		}
+	public void onCreateResources(final OnCreateResourcesCallback pOnCreateResourcesCallback) throws Exception {
+		pOnCreateResourcesCallback.onCreateResourcesFinished();
 	}
 
 	@Override
-	public Scene onCreateScene() {
+	public void onCreateScene(final OnCreateSceneCallback pOnCreateSceneCallback) throws Exception {
 		this.mEngine.registerUpdateHandler(new FPSLogger());
 
 		final Scene scene = new Scene();
 		scene.setOnAreaTouchTraversalFrontToBack();
-		scene.setBackground(new Background(1, 0, 0, 1));
+		scene.setBackground(new Background(1, 1, 1, 1));
+		
+		final Sprite rectangle = (Sprite)Test.test();
+		scene.attachChild(rectangle);
+		scene.registerTouchArea(rectangle);
 
-		scene.attachChild((IEntity)Test.test());
+		pOnCreateSceneCallback.onCreateSceneFinished(scene);
+	}
 
-		return scene;
+	@Override
+	public void onPopulateScene(final Scene pScene, final OnPopulateSceneCallback pOnPopulateSceneCallback) throws Exception {
+		pOnPopulateSceneCallback.onPopulateSceneFinished();
 	}
 
 	@Override

From 6f2429a83d93cff66c48c325a44e315ae550c2a5 Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Wed, 7 Mar 2012 16:38:37 -0800
Subject: [PATCH 08/17] Minor changes.

---
 src/org/andengine/examples/ButtonSpriteExample.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/andengine/examples/ButtonSpriteExample.java b/src/org/andengine/examples/ButtonSpriteExample.java
index d47cb2a..67f4435 100644
--- a/src/org/andengine/examples/ButtonSpriteExample.java
+++ b/src/org/andengine/examples/ButtonSpriteExample.java
@@ -104,7 +104,7 @@ public Scene onCreateScene() {
 
 	@Override
 	public void onClick(final ButtonSprite pButtonSprite, final float pTouchAreaLocalX, final float pTouchAreaLocalY) {
-		runOnUiThread(new Runnable() {
+		this.runOnUiThread(new Runnable() {
 			@Override
 			public void run() {
 				Toast.makeText(ButtonSpriteExample.this, "Clicked", Toast.LENGTH_LONG).show();

From e0fb126bd7cedda8ecb3a01fb909f20c948b0e64 Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Wed, 7 Mar 2012 16:39:46 -0800
Subject: [PATCH 09/17] Updated ScriptingExamle to latest
 AndEngineScriptingExtension@GLES2-JavaScriptCore.

---
 .../andengine/examples/ScriptingExample.java  | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/org/andengine/examples/ScriptingExample.java b/src/org/andengine/examples/ScriptingExample.java
index 8fcb38c..b8de11e 100644
--- a/src/org/andengine/examples/ScriptingExample.java
+++ b/src/org/andengine/examples/ScriptingExample.java
@@ -1,7 +1,5 @@
 package org.andengine.examples;
 
-import java.io.IOException;
-
 import org.andengine.engine.Engine;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
@@ -13,10 +11,7 @@
 import org.andengine.entity.util.FPSLogger;
 import org.andengine.extension.scripting.ScriptingEnvironment;
 import org.andengine.extension.scripting.Test;
-import org.andengine.opengl.texture.ITexture;
-import org.andengine.opengl.texture.bitmap.AssetBitmapTexture;
-import org.andengine.opengl.texture.region.ITextureRegion;
-import org.andengine.opengl.texture.region.TextureRegionFactory;
+import org.andengine.extension.scripting.engine.EngineProxy;
 import org.andengine.ui.activity.LayoutGameActivity;
 import org.andengine.util.debug.Debug;
 import org.andengine.util.system.SystemUtils;
@@ -60,13 +55,6 @@ public class ScriptingExample extends LayoutGameActivity implements OnClickListe
 
 	@Override
 	protected void onCreate(Bundle pSavedInstanceState) {
-		try {
-			final String apkFilePath = SystemUtils.getApkFilePath(this);
-			ScriptingEnvironment.init(this, apkFilePath);
-		} catch (final NameNotFoundException e) {
-			Debug.e(e);
-		}
-
 		super.onCreate(pSavedInstanceState);
 	}
 
@@ -97,7 +85,7 @@ public EngineOptions onCreateEngineOptions() {
 
 	@Override
 	public Engine onCreateEngine(final EngineOptions pEngineOptions) {
-		return ScriptingEnvironment.onCreateEngine(pEngineOptions);
+		return new Engine(pEngineOptions);
 	}
 
 	@Override
@@ -125,10 +113,6 @@ public void onCreateScene(final OnCreateSceneCallback pOnCreateSceneCallback) th
 		final Scene scene = new Scene();
 		scene.setOnAreaTouchTraversalFrontToBack();
 		scene.setBackground(new Background(1, 1, 1, 1));
-		
-		final Sprite rectangle = (Sprite)Test.test();
-		scene.attachChild(rectangle);
-		scene.registerTouchArea(rectangle);
 
 		pOnCreateSceneCallback.onCreateSceneFinished(scene);
 	}
@@ -138,6 +122,29 @@ public void onPopulateScene(final Scene pScene, final OnPopulateSceneCallback pO
 		pOnPopulateSceneCallback.onPopulateSceneFinished();
 	}
 
+	@Override
+	public synchronized void onGameCreated() {
+		super.onGameCreated();
+
+		this.runOnUpdateThread(new Runnable() {
+			@Override
+			public void run() {
+				try {
+					final String apkFilePath = SystemUtils.getApkFilePath(ScriptingExample.this);
+					ScriptingEnvironment.init(ScriptingExample.this, apkFilePath, ScriptingExample.this.getEngine());
+				} catch (final NameNotFoundException e) {
+					Debug.e(e);
+				}
+
+				final Sprite rectangle = (Sprite)Test.test();
+
+				final Scene scene = ScriptingExample.this.getEngine().getScene();
+				scene.attachChild(rectangle);
+				scene.registerTouchArea(rectangle);
+			}
+		});
+	}
+
 	@Override
 	public void onClick(final View pView) {
 		/* Do sth. */

From 4e44941f8be00be389406916f7bf8b07a6ad6460 Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Wed, 21 Mar 2012 14:35:07 -0700
Subject: [PATCH 10/17] Added CardinalSplineMoveModifierExample.

---
 AndroidManifest.xml                           |   1 +
 res/values/strings.xml                        |   6 +-
 .../CardinalSplineMoveModifierExample.java    | 150 ++++++++++++++++++
 .../andengine/examples/launcher/Example.java  |   2 +
 .../examples/launcher/ExampleGroup.java       |   2 +-
 .../examples/launcher/ExampleLauncher.java    |  45 ++++--
 6 files changed, 188 insertions(+), 18 deletions(-)
 create mode 100644 src/org/andengine/examples/CardinalSplineMoveModifierExample.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f692bdf..79ec07b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -37,6 +37,7 @@
 		<activity android:name=".BitmapFontExample" android:configChanges="orientation"/>
 		<activity android:name=".BoundCameraExample" android:configChanges="orientation"/>
 		<activity android:name=".CanvasTextureCompositingExample" android:configChanges="orientation"/>
+		<activity android:name=".CardinalSplineMoveModifierExample" android:configChanges="orientation"/>
 		<activity android:name=".ChangeableTextExample" android:configChanges="orientation"/>
 		<activity android:name=".CollisionDetectionExample" android:configChanges="orientation"/>
 		<activity android:name=".ColorKeyTextureSourceDecoratorExample" android:configChanges="orientation"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 15eb6a3..dfd40ff 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,6 +4,9 @@
 
     <string name="btn_get_involved_caption">Open Source - Get involved...</string>
 
+    <string name="dialog_device_not_supported_title">Unsupported Device detected!</string>
+    <string name="dialog_device_not_supported_message">Your device isn\'t supported by <b>AndEngine</b>!\n\nPlease send your device information to nicolasgramlich@gmail.com so that we can hopefully add support in the next release!</string>
+
     <string name="dialog_first_app_launch_title">AndEngine - Examples</string>
     <string name="dialog_first_app_launch_message">Welcome to <b>AndEngine</b> the:\n - Free\n - Open Source\n - 2D OpenGL \n - Game-Engine\nfor the Google Android platform.\n\nThese <b>examples</b> are meant for <b>developers</b> to showcase what can be done with <b>AndEngine</b>.\n\nIt\'s Open Source - Get involved!\n\nBest Regards,\nNicolas Gramlich</string>
 
@@ -22,7 +25,7 @@
 	<string name="tv_xmllayoutexample_below">Lorem ipsum dolor sit amat...</string>
 
 	<string name="textbreakexample_text_default">Hello, World!</string>
-	
+
 	<string name="scriptingexample_code_hint">Enter code here...</string>
 	<string name="scriptingexample_code_apply">Apply</string>
 
@@ -53,6 +56,7 @@
 	<string name="example_bitmapfont">Using a BitmapFont</string>
 	<string name="example_boundcamera">Using a BoundCamera</string>
 	<string name="example_canvastexturecompositing">Compositing Textures (Canvas)</string>
+	<string name="example_cardinalsplinemovemodifier">Cardinal Spline</string>
 	<string name="example_changeabletext">Changeable Text</string>
 	<string name="example_collisiondetection">Collision Detection</string>
 	<string name="example_colorkeytexturesourcedecorator">Using a ColorKeyTextureSourceDecorator</string>
diff --git a/src/org/andengine/examples/CardinalSplineMoveModifierExample.java b/src/org/andengine/examples/CardinalSplineMoveModifierExample.java
new file mode 100644
index 0000000..db15ae8
--- /dev/null
+++ b/src/org/andengine/examples/CardinalSplineMoveModifierExample.java
@@ -0,0 +1,150 @@
+package org.andengine.examples;
+
+import org.andengine.engine.camera.Camera;
+import org.andengine.engine.options.EngineOptions;
+import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
+import org.andengine.entity.modifier.CardinalSplineMoveModifier;
+import org.andengine.entity.modifier.CardinalSplineMoveModifier.CardinalSplineMoveModifierConfig;
+import org.andengine.entity.modifier.DelayModifier;
+import org.andengine.entity.modifier.LoopEntityModifier;
+import org.andengine.entity.modifier.ParallelEntityModifier;
+import org.andengine.entity.modifier.RotationModifier;
+import org.andengine.entity.modifier.SequenceEntityModifier;
+import org.andengine.entity.primitive.Rectangle;
+import org.andengine.entity.scene.Scene;
+import org.andengine.entity.scene.background.Background;
+import org.andengine.entity.util.FPSLogger;
+import org.andengine.ui.activity.SimpleBaseGameActivity;
+import org.andengine.util.math.MathUtils;
+
+import android.opengl.GLES20;
+
+/**
+ * (c) 2010 Nicolas Gramlich
+ * (c) 2011 Zynga
+ *
+ * @author Nicolas Gramlich
+ * @since 11:54:51 - 03.04.2010
+ */
+public class CardinalSplineMoveModifierExample extends SimpleBaseGameActivity {
+	// ===========================================================
+	// Constants
+	// ===========================================================
+
+	private static final int CAMERA_WIDTH = 720;
+	private static final int CAMERA_HEIGHT = 480;
+
+	private static final int COUNT = 500;
+	private static final float DURATION = 4;
+	private static final float SIZE = 20;
+
+	private static final float[] CONTROLPOINT_1_XS = {
+		2 * (CAMERA_WIDTH / 4),
+		1 * (CAMERA_WIDTH / 4),
+		1.5f * (CAMERA_WIDTH / 4),
+		2 * (CAMERA_WIDTH / 4)
+	};
+
+	private static final float[] CONTROLPOINT_2_XS = {
+		2 * (CAMERA_WIDTH / 4),
+		3 * (CAMERA_WIDTH / 4),
+		2.5f * (CAMERA_WIDTH / 4),
+		2 * (CAMERA_WIDTH / 4)
+	};
+
+	private static final float[] CONTROLPOINT_YS = {
+		3.5f * (CAMERA_HEIGHT / 4),
+		2 * (CAMERA_HEIGHT / 4),
+		1 * (CAMERA_HEIGHT / 4),
+		1.5f * (CAMERA_HEIGHT / 4),
+	};
+
+	// ===========================================================
+	// Fields
+	// ===========================================================
+
+	// ===========================================================
+	// Constructors
+	// ===========================================================
+
+	// ===========================================================
+	// Getter & Setter
+	// ===========================================================
+
+	// ===========================================================
+	// Methods for/from SuperClass/Interfaces
+	// ===========================================================
+
+	@Override
+	public EngineOptions onCreateEngineOptions() {
+		final Camera camera = new Camera(0, 0, CAMERA_WIDTH, CAMERA_HEIGHT);
+
+		return new EngineOptions(true, ScreenOrientation.LANDSCAPE_FIXED, new RatioResolutionPolicy(CAMERA_WIDTH, CAMERA_HEIGHT), camera);
+	}
+
+	@Override
+	public void onCreateResources() {
+
+	}
+
+	@Override
+	public Scene onCreateScene() {
+		this.mEngine.registerUpdateHandler(new FPSLogger());
+
+		final Scene scene = new Scene();
+		scene.setBackground(new Background(0, 0, 0));
+
+		for(int i = 0; i < COUNT; i++) {
+			this.addRectangleWithTension(scene, MathUtils.random(-1f, 1f), MathUtils.random(0, DURATION * 2f));
+		}
+
+		return scene;
+	}
+
+	private void addRectangleWithTension(final Scene pScene, final float pTension, float pDelay) {
+		final Rectangle rectangle = new Rectangle(0, 0, SIZE, SIZE, this.getVertexBufferObjectManager());
+		rectangle.setBlendFunction(GLES20.GL_SRC_ALPHA, GLES20.GL_ONE);
+		if(pTension < 0) {
+			rectangle.setColor(1 - pTension, 0, 0, 0.5f);
+		} else {
+			rectangle.setColor(pTension, 0, 0, 0.5f);
+		}
+
+		final CardinalSplineMoveModifierConfig catmullRomMoveModifierConfig1 = new CardinalSplineMoveModifierConfig(CardinalSplineMoveModifierExample.CONTROLPOINT_1_XS.length, pTension);
+		final CardinalSplineMoveModifierConfig catmullRomMoveModifierConfig2 = new CardinalSplineMoveModifierConfig(CardinalSplineMoveModifierExample.CONTROLPOINT_1_XS.length, pTension);
+
+		for(int i = 0; i < CardinalSplineMoveModifierExample.CONTROLPOINT_1_XS.length; i++) {
+			catmullRomMoveModifierConfig1.setControlPoint(i, CardinalSplineMoveModifierExample.CONTROLPOINT_1_XS[i] - SIZE / 2, CardinalSplineMoveModifierExample.CONTROLPOINT_YS[i] - SIZE / 2);
+			catmullRomMoveModifierConfig2.setControlPoint(i, CardinalSplineMoveModifierExample.CONTROLPOINT_2_XS[i] - SIZE / 2, CardinalSplineMoveModifierExample.CONTROLPOINT_YS[i] - SIZE / 2);
+		}
+
+		rectangle.registerEntityModifier(
+			new SequenceEntityModifier(
+				new DelayModifier(pDelay),
+				new LoopEntityModifier(
+					new SequenceEntityModifier(
+						new ParallelEntityModifier(
+							new CardinalSplineMoveModifier(CardinalSplineMoveModifierExample.DURATION, catmullRomMoveModifierConfig1),
+							new RotationModifier(CardinalSplineMoveModifierExample.DURATION, 0, 360)
+						),
+						new ParallelEntityModifier(
+							new CardinalSplineMoveModifier(CardinalSplineMoveModifierExample.DURATION, catmullRomMoveModifierConfig2),
+							new RotationModifier(CardinalSplineMoveModifierExample.DURATION, 0, 360)
+						)
+					)
+				)
+			)
+		);
+
+		pScene.attachChild(rectangle);
+	}
+
+	// ===========================================================
+	// Methods
+	// ===========================================================
+
+	// ===========================================================
+	// Inner and Anonymous Classes
+	// ===========================================================
+}
diff --git a/src/org/andengine/examples/launcher/Example.java b/src/org/andengine/examples/launcher/Example.java
index 0938cdb..d8a13a0 100644
--- a/src/org/andengine/examples/launcher/Example.java
+++ b/src/org/andengine/examples/launcher/Example.java
@@ -7,6 +7,7 @@
 import org.andengine.examples.BitmapFontExample;
 import org.andengine.examples.BoundCameraExample;
 import org.andengine.examples.CanvasTextureCompositingExample;
+import org.andengine.examples.CardinalSplineMoveModifierExample;
 import org.andengine.examples.CollisionDetectionExample;
 import org.andengine.examples.ColorKeyTextureSourceDecoratorExample;
 import org.andengine.examples.CoordinateConversionExample;
@@ -106,6 +107,7 @@ enum Example {
 	AUTOPARALLAXBACKGROUND(AutoParallaxBackgroundExample.class, R.string.example_autoparallaxbackground),
 	BITMAPFONT(BitmapFontExample.class, R.string.example_bitmapfont),
 	BOUNDCAMERA(BoundCameraExample.class, R.string.example_boundcamera),
+	CARDINALSPLINEMOVEMODIFIER(CardinalSplineMoveModifierExample.class, R.string.example_cardinalsplinemovemodifier),
 	CANVASTEXTURECOMPOSITING(CanvasTextureCompositingExample.class, R.string.example_canvastexturecompositing),
 	CHANGEABLETEXT(TextExample.class, R.string.example_changeabletext),
 	COLLISIONDETECTION(CollisionDetectionExample.class, R.string.example_collisiondetection),
diff --git a/src/org/andengine/examples/launcher/ExampleGroup.java b/src/org/andengine/examples/launcher/ExampleGroup.java
index fc69481..69f60b6 100644
--- a/src/org/andengine/examples/launcher/ExampleGroup.java
+++ b/src/org/andengine/examples/launcher/ExampleGroup.java
@@ -18,7 +18,7 @@ public enum ExampleGroup {
 	SIMPLE(R.string.examplegroup_simple, 
 			Example.LINE, Example.RECTANGLE, Example.SPRITE, Example.SPRITEREMOVE, Example.SPRITEBATCH),
 	MODIFIER_AND_ANIMATION(R.string.examplegroup_modifier_and_animation, 
-			Example.MOVINGBALL, Example.ENTITYMODIFIER, Example.ENTITYMODIFIERIRREGULAR, Example.PATHMODIFIER, Example.ANIMATEDSPRITES, Example.EASEFUNCTION, Example.ROTATION3D ),
+			Example.MOVINGBALL, Example.ENTITYMODIFIER, Example.ENTITYMODIFIERIRREGULAR, Example.CARDINALSPLINEMOVEMODIFIER, Example.PATHMODIFIER, Example.ANIMATEDSPRITES, Example.EASEFUNCTION, Example.ROTATION3D ),
 	TOUCH(R.string.examplegroup_touch, 
 			Example.TOUCHDRAG, Example.MULTITOUCH, Example.ANALOGONSCREENCONTROL, Example.DIGITALONSCREENCONTROL, Example.ANALOGONSCREENCONTROLS, Example.COORDINATECONVERSION, Example.PINCHZOOM),
 	PARTICLESYSTEM(R.string.examplegroup_particlesystems,
diff --git a/src/org/andengine/examples/launcher/ExampleLauncher.java b/src/org/andengine/examples/launcher/ExampleLauncher.java
index 9694966..66744c3 100644
--- a/src/org/andengine/examples/launcher/ExampleLauncher.java
+++ b/src/org/andengine/examples/launcher/ExampleLauncher.java
@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 
+import org.andengine.AndEngine;
 import org.andengine.examples.R;
 import org.andengine.util.debug.Debug;
 
@@ -21,7 +22,7 @@
 import android.widget.Toast;
 
 /**
- * (c) 2010 Nicolas Gramlich 
+ * (c) 2010 Nicolas Gramlich
  * (c) 2011 Zynga Inc.
  * 
  * @author Nicolas Gramlich
@@ -35,8 +36,9 @@ public class ExampleLauncher extends ExpandableListActivity {
 	private static final String PREF_LAST_APP_LAUNCH_VERSIONCODE_ID = "last.app.launch.versioncode";
 
 	private static final int DIALOG_FIRST_APP_LAUNCH = 0;
-	private static final int DIALOG_NEW_IN_THIS_VERSION = DIALOG_FIRST_APP_LAUNCH + 1;
-	private static final int DIALOG_BENCHMARKS_SUBMIT_PLEASE = DIALOG_NEW_IN_THIS_VERSION + 1;
+	private static final int DIALOG_NEW_IN_THIS_VERSION = ExampleLauncher.DIALOG_FIRST_APP_LAUNCH + 1;
+	private static final int DIALOG_BENCHMARKS_SUBMIT_PLEASE = ExampleLauncher.DIALOG_NEW_IN_THIS_VERSION + 1;
+	private static final int DIALOG_DEVICE_NOT_SUPPORTED = ExampleLauncher.DIALOG_BENCHMARKS_SUBMIT_PLEASE + 1;
 
 	// ===========================================================
 	// Fields
@@ -56,6 +58,10 @@ public class ExampleLauncher extends ExpandableListActivity {
 	public void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
+		if(!AndEngine.isDeviceSupported()) {
+			this.showDialog(ExampleLauncher.DIALOG_DEVICE_NOT_SUPPORTED);
+		}
+
 		this.setContentView(R.layout.list_examples);
 
 		this.mExpandableExampleLauncherListAdapter = new ExpandableExampleLauncherListAdapter(this);
@@ -72,17 +78,17 @@ public void onClick(final View pView) {
 		final SharedPreferences prefs = this.getPreferences(Context.MODE_PRIVATE);
 
 		this.mVersionCodeCurrent = this.getVersionCode();
-		this.mVersionCodeLastLaunch = prefs.getInt(PREF_LAST_APP_LAUNCH_VERSIONCODE_ID, -1);
+		this.mVersionCodeLastLaunch = prefs.getInt(ExampleLauncher.PREF_LAST_APP_LAUNCH_VERSIONCODE_ID, -1);
 
 		if(this.isFirstTime("first.app.launch")) {
-			this.showDialog(DIALOG_FIRST_APP_LAUNCH);
-		} else if(this.mVersionCodeLastLaunch != -1 && this.mVersionCodeLastLaunch < this.mVersionCodeCurrent){
-			this.showDialog(DIALOG_NEW_IN_THIS_VERSION);
-		} else if(isFirstTime("please.submit.benchmarks")){
-			this.showDialog(DIALOG_BENCHMARKS_SUBMIT_PLEASE);
+			this.showDialog(ExampleLauncher.DIALOG_FIRST_APP_LAUNCH);
+		} else if((this.mVersionCodeLastLaunch != -1) && (this.mVersionCodeLastLaunch < this.mVersionCodeCurrent)){
+			this.showDialog(ExampleLauncher.DIALOG_NEW_IN_THIS_VERSION);
+		} else if(this.isFirstTime("please.submit.benchmarks")){
+			this.showDialog(ExampleLauncher.DIALOG_BENCHMARKS_SUBMIT_PLEASE);
 		}
 
-		prefs.edit().putInt(PREF_LAST_APP_LAUNCH_VERSIONCODE_ID, this.mVersionCodeCurrent).commit();
+		prefs.edit().putInt(ExampleLauncher.PREF_LAST_APP_LAUNCH_VERSIONCODE_ID, this.mVersionCodeCurrent).commit();
 	}
 
 	// ===========================================================
@@ -96,6 +102,13 @@ public void onClick(final View pView) {
 	@Override
 	protected Dialog onCreateDialog(final int pId) {
 		switch(pId) {
+			case DIALOG_DEVICE_NOT_SUPPORTED:
+				return new AlertDialog.Builder(this)
+					.setTitle(R.string.dialog_device_not_supported_title)
+					.setMessage(R.string.dialog_device_not_supported_message)
+					.setIcon(android.R.drawable.ic_dialog_alert)
+					.setPositiveButton(android.R.string.ok, null)
+					.create();
 			case DIALOG_FIRST_APP_LAUNCH:
 				return new AlertDialog.Builder(this)
 					.setTitle(R.string.dialog_first_app_launch_title)
@@ -113,21 +126,21 @@ protected Dialog onCreateDialog(final int pId) {
 			case DIALOG_NEW_IN_THIS_VERSION:
 				final int[] versionCodes = this.getResources().getIntArray(R.array.new_in_version_versioncode);
 				final int versionDescriptionsStartIndex = Math.max(0, Arrays.binarySearch(versionCodes, this.mVersionCodeLastLaunch) + 1);
-				
+
 				final String[] versionDescriptions = this.getResources().getStringArray(R.array.new_in_version_changes);
-				
+
 				final StringBuilder sb = new StringBuilder();
 				for(int i = versionDescriptions.length - 1; i >= versionDescriptionsStartIndex; i--) {
 					sb.append("--------------------------\n");
 					sb.append(">>>  Version: " + versionCodes[i] + "\n");
 					sb.append("--------------------------\n");
 					sb.append(versionDescriptions[i]);
-					
+
 					if(i > versionDescriptionsStartIndex){
 						sb.append("\n\n");
 					}
 				}
-				
+
 				return new AlertDialog.Builder(this)
 					.setTitle(R.string.dialog_new_in_this_version_title)
 					.setMessage(sb.toString())
@@ -138,9 +151,9 @@ protected Dialog onCreateDialog(final int pId) {
 				return super.onCreateDialog(pId);
 		}
 	}
-	
+
 	@Override
-	public void onGroupExpand(int pGroupPosition) {
+	public void onGroupExpand(final int pGroupPosition) {
 		switch(this.mExpandableExampleLauncherListAdapter.getGroup(pGroupPosition)){
 			case BENCHMARK:
 				Toast.makeText(this, "When running a benchmark, a dialog with the results will appear after some seconds.", Toast.LENGTH_SHORT).show();

From 3eac01b8fd232045323b991cf86f0f0e5069915a Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Fri, 23 Mar 2012 11:38:52 -0700
Subject: [PATCH 11/17] Fixed merge fail.

---
 .../CardinalSplineMoveModifierExample.java    | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/src/org/andengine/examples/CardinalSplineMoveModifierExample.java b/src/org/andengine/examples/CardinalSplineMoveModifierExample.java
index 0b94187..c2c10d6 100644
--- a/src/org/andengine/examples/CardinalSplineMoveModifierExample.java
+++ b/src/org/andengine/examples/CardinalSplineMoveModifierExample.java
@@ -39,15 +39,9 @@ public class CardinalSplineMoveModifierExample extends SimpleBaseGameActivity {
 	private static final int CAMERA_WIDTH = 720;
 	private static final int CAMERA_HEIGHT = 480;
 
-<<<<<<< HEAD
-	private static final int COUNT = 500;
-	private static final float DURATION = 4;
-	private static final float SIZE = 20;
-=======
 	private static final int COUNT = 400;
 	private static final float DURATION = 4;
 	private static final float SIZE = 25;
->>>>>>> GLES2
 
 	private static final float[] CONTROLPOINT_1_XS = {
 		2 * (CAMERA_WIDTH / 4),
@@ -106,23 +100,15 @@ public Scene onCreateScene() {
 		scene.setBackground(new Background(0, 0, 0));
 
 		for(int i = 0; i < COUNT; i++) {
-<<<<<<< HEAD
-			this.addRectangleWithTension(scene, MathUtils.random(-1f, 1f), MathUtils.random(0, DURATION * 2f));
-=======
 			final float tension = MathUtils.random(-0.5f, 0.5f);
 			this.addRectangleWithTension(scene, tension, MathUtils.random(0, DURATION * 2f));
->>>>>>> GLES2
 		}
 
 		return scene;
 	}
 
 	private void addRectangleWithTension(final Scene pScene, final float pTension, float pDelay) {
-<<<<<<< HEAD
-		final Rectangle rectangle = new Rectangle(0, 0, SIZE, SIZE, this.getVertexBufferObjectManager());
-=======
 		final Rectangle rectangle = new Rectangle(-SIZE, -SIZE, SIZE, SIZE, this.getVertexBufferObjectManager());
->>>>>>> GLES2
 		rectangle.setBlendFunction(GLES20.GL_SRC_ALPHA, GLES20.GL_ONE);
 		if(pTension < 0) {
 			rectangle.setColor(1 - pTension, 0, 0, 0.5f);
@@ -144,21 +130,12 @@ private void addRectangleWithTension(final Scene pScene, final float pTension, f
 				new LoopEntityModifier(
 					new SequenceEntityModifier(
 						new ParallelEntityModifier(
-<<<<<<< HEAD
-							new CardinalSplineMoveModifier(CardinalSplineMoveModifierExample.DURATION, catmullRomMoveModifierConfig1),
-							new RotationModifier(CardinalSplineMoveModifierExample.DURATION, 0, 360)
-						),
-						new ParallelEntityModifier(
-							new CardinalSplineMoveModifier(CardinalSplineMoveModifierExample.DURATION, catmullRomMoveModifierConfig2),
-							new RotationModifier(CardinalSplineMoveModifierExample.DURATION, 0, 360)
-=======
 							new CardinalSplineMoveModifier(CardinalSplineMoveModifierExample.DURATION, catmullRomMoveModifierConfig1, EaseLinear.getInstance()),
 							new RotationModifier(CardinalSplineMoveModifierExample.DURATION, -45, -315)
 						),
 						new ParallelEntityModifier(
 							new CardinalSplineMoveModifier(CardinalSplineMoveModifierExample.DURATION, catmullRomMoveModifierConfig2, EaseLinear.getInstance()),
 							new RotationModifier(CardinalSplineMoveModifierExample.DURATION, 45, 315)
->>>>>>> GLES2
 						)
 					)
 				)

From 8b46e33451849ea14baefda941db391eacca39ae Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Fri, 23 Mar 2012 11:41:12 -0700
Subject: [PATCH 12/17] Fixed merge fail (this time for real).

---
 .../andengine/examples/CardinalSplineMoveModifierExample.java  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/org/andengine/examples/CardinalSplineMoveModifierExample.java b/src/org/andengine/examples/CardinalSplineMoveModifierExample.java
index c2c10d6..b0931c4 100644
--- a/src/org/andengine/examples/CardinalSplineMoveModifierExample.java
+++ b/src/org/andengine/examples/CardinalSplineMoveModifierExample.java
@@ -17,10 +17,7 @@
 import org.andengine.entity.util.FPSLogger;
 import org.andengine.ui.activity.SimpleBaseGameActivity;
 import org.andengine.util.math.MathUtils;
-<<<<<<< HEAD
-=======
 import org.andengine.util.modifier.ease.EaseLinear;
->>>>>>> GLES2
 
 import android.opengl.GLES20;
 

From 1e4a1b0296275a542f2a80b47a76693eadfa7977 Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Fri, 30 Mar 2012 17:35:29 -0700
Subject: [PATCH 13/17] Updated SriptingExample. Added default code for
 ScriptingExample, which is creating an Entity.

---
 assets/js/scriptingexample.js                 |  34 +----
 assets/js/scriptingexample_rhino.js           | 126 ------------------
 .../andengine/examples/ScriptingExample.java  |  36 +++--
 3 files changed, 18 insertions(+), 178 deletions(-)
 delete mode 100644 assets/js/scriptingexample_rhino.js

diff --git a/assets/js/scriptingexample.js b/assets/js/scriptingexample.js
index 55bd788..06584c4 100644
--- a/assets/js/scriptingexample.js
+++ b/assets/js/scriptingexample.js
@@ -1,33 +1,3 @@
-var scaleUp = true;
+var entity = new andengine.Entity(10, 20)
 
-function onUpdate(pSecondsElapsed) {
-    mSprite.setRotation(mSprite.getRotation() + 90 * pSecondsElapsed);
-
-    var scale = mSprite.getScaleX();
-    if(scaleUp) {
-        if(scale < 2) {
-            mSprite.setScale(scale + 1 * pSecondsElapsed);
-        } else {
-            scaleUp = false;        
-        }
-    } else {
-        if(scale > 1) {
-            mSprite.setScale(scale - 2 * pSecondsElapsed);
-        } else {
-            scaleUp = true;        
-        }
-    }
-}
-
-//function onClick() {
-//    var widgets = Packages.android.widget;
-//    var view = new widgets.TextView(mContext);
-//    mContext.setContentView(view);
-//    var text = 'Hello Android!\\nThis is JavaScript in action!';
-//    view.append(text);
-//    if(mSprite.isAnimationRunning()) {
-//        mSprite.stopAnimation();
-//    } else {
-//        mSprite.animate(100);
-//    }
-//}
+entity.x = entity.y * 2;
\ No newline at end of file
diff --git a/assets/js/scriptingexample_rhino.js b/assets/js/scriptingexample_rhino.js
deleted file mode 100644
index 2918a74..0000000
--- a/assets/js/scriptingexample_rhino.js
+++ /dev/null
@@ -1,126 +0,0 @@
-var AndEnginePackages = JavaImporter(
-	// ###########
-	// ENGINE
-	// ###########
-
-	// Widgets
-	Packages.android.widget,
-
-	// ###########
-	// ENGINE
-	// ###########
-
-	// Engine
-	Packages.org.andengine.engine,
-	Packages.org.andengine.engine.options,
-
-	// Handlers
-	Packages.org.andengine.engine.handler,
-	Packages.org.andengine.engine.handler.collision,
-	Packages.org.andengine.engine.handler.physics,
-	Packages.org.andengine.engine.handler.runnable,
-	Packages.org.andengine.engine.handler.timer,
-	
-	// Camera
-	Packages.org.andengine.engine.camera,
-	
-	// Touch
-	Packages.org.andengine.input.touch,
-	Packages.org.andengine.input.touch.controller,
-	Packages.org.andengine.input.touch.detector,
-
-	// ###########
-	// OPENGL
-	// ###########
-
-	// Textures
-	Packages.org.andengine.opengl.texture,
-	Packages.org.andengine.opengl.texture.atlas,
-	Packages.org.andengine.opengl.texture.atlas.bitmap,
-	Packages.org.andengine.opengl.texture.atlas.bitmap.source,
-	Packages.org.andengine.opengl.texture.atlas.buildable,
-	Packages.org.andengine.opengl.texture.bitmap,
-	Packages.org.andengine.opengl.texture.compressed.etc1,
-	Packages.org.andengine.opengl.texture.compressed.pvr,
-	Packages.org.andengine.opengl.texture.region,
-	Packages.org.andengine.opengl.texture.render,
-
-	// Util
-	Packages.org.andengine.opengl.texture.util,
-	
-	// ###########
-	// ENTITY
-	// ###########
-
-	// Entity
-	Packages.org.andengine.entity.sprite,
-	Packages.org.andengine.entity.primitive,
-	Packages.org.andengine.entity.scene,
-	Packages.org.andengine.entity.shape,
-	Packages.org.andengine.entity.sprite,
-	Packages.org.andengine.entity.sprite.batch,
-	Packages.org.andengine.entity.text,
-
-	// Modifier
-	Packages.org.andengine.entity.modifier,
-	Packages.org.andengine.util.modifier.ease,
-
-	// Util
-	Packages.org.andengine.entity.util,
-	
-	// ###########
-	// UTIL
-	// ###########
-	Packages.org.andengine.util,
-	Packages.org.andengine.util.math,
-	Packages.org.andengine.util.spatial,
-	Packages.org.andengine.util.spatial.adt.bounds,
-	Packages.org.andengine.util.spatial.adt.bounds.util,
-	Packages.org.andengine.util.spatial.quadtree,
-
-	Packages.android.graphics
-);
-
-with(AndEnginePackages) {
-	var engine = mContext.getEngine();
-	var scene = engine.getScene();
-	var camera = engine.getCamera();
-	
-	var size = 100;
-	
-	var x = MathUtils.random(0, camera.getWidth()) - size / 2;
-	var y = MathUtils.random(0, camera.getHeight()) - size / 2;
-
-	/*
-	var rectangle = new Rectangle(x, y, size, size, engine.getVertexBufferObjectManager());
-	*/
-
-	var bounds = new AbstractIntBounds(0, 1, 2, 3) {
-		getXMin: function() {
-			return 4;
-		}
-	}
-
-	var point = new AbstractPoint(0, 1) {
-		set: function(pX, pY) {
-			return;
-		}
-	}
-
-	var rectangle = new AbstractRectangle(x, y, size, size, engine.getVertexBufferObjectManager()) {
-		onAreaTouched: function(pSceneTouchEvent, pTouchAreaLocalX, pTouchAreaLocalY) {
-			pTouchArea.setColor(1, 1, 0, 1);
-		}
-	};
-
-	rectangle.setColor(1, 0, 0, 1);
-	scene.attachChild(rectangle);
-	scene.registerTouchArea(rectangle);
-	scene.setOnAreaTouchListener(new Packages.org.andengine.entity.scene.Scene.IOnAreaTouchListener() {
-		onAreaTouched: function(pSceneTouchEvent, pTouchArea, pTouchAreaLocalX, pTouchAreaLocalY) {
-			pTouchArea.setColor(0, 1, 0, 1);
-			pTouchArea.registerEntityModifier(new LoopEntityModifier(new RotationModifier(6, 0, 360, EaseExponentialInOut.getInstance())));
-			return true;
-		}
-	});
-}
diff --git a/src/org/andengine/examples/ScriptingExample.java b/src/org/andengine/examples/ScriptingExample.java
index b8de11e..5d6fc53 100644
--- a/src/org/andengine/examples/ScriptingExample.java
+++ b/src/org/andengine/examples/ScriptingExample.java
@@ -1,5 +1,7 @@
 package org.andengine.examples;
 
+import java.io.IOException;
+
 import org.andengine.engine.Engine;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
@@ -9,15 +11,12 @@
 import org.andengine.entity.scene.background.Background;
 import org.andengine.entity.sprite.Sprite;
 import org.andengine.entity.util.FPSLogger;
-import org.andengine.extension.scripting.ScriptingEnvironment;
+import org.andengine.extension.scripting.AndEngineScriptingExtension;
 import org.andengine.extension.scripting.Test;
-import org.andengine.extension.scripting.engine.EngineProxy;
 import org.andengine.ui.activity.LayoutGameActivity;
+import org.andengine.util.StreamUtils;
 import org.andengine.util.debug.Debug;
-import org.andengine.util.system.SystemUtils;
 
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.EditText;
@@ -36,7 +35,6 @@ public class ScriptingExample extends LayoutGameActivity implements OnClickListe
 
 	static {
 		System.loadLibrary("gnustl_shared");
-//		System.loadLibrary("js");
 		System.loadLibrary("andenginescriptingextension");
 	}
 
@@ -53,11 +51,6 @@ public class ScriptingExample extends LayoutGameActivity implements OnClickListe
 	// Constructors
 	// ===========================================================
 
-	@Override
-	protected void onCreate(Bundle pSavedInstanceState) {
-		super.onCreate(pSavedInstanceState);
-	}
-
 	// ===========================================================
 	// Getter & Setter
 	// ===========================================================
@@ -94,10 +87,11 @@ protected void onSetContentView() {
 
 		this.mEditTextCode = (EditText) this.findViewById(R.id.scriptingexample_code);
 		try {
-			this.mEditTextCode.setText(SystemUtils.getApkFilePath(this));
-		} catch (final NameNotFoundException e) {
+			this.mEditTextCode.setText(StreamUtils.readFully(this.getAssets().open("js/scriptingexample.js")));
+		} catch (final IOException e) {
 			Debug.e(e);
 		}
+
 		this.findViewById(R.id.scriptingexample_code_apply).setOnClickListener(this);
 	}
 
@@ -129,12 +123,7 @@ public synchronized void onGameCreated() {
 		this.runOnUpdateThread(new Runnable() {
 			@Override
 			public void run() {
-				try {
-					final String apkFilePath = SystemUtils.getApkFilePath(ScriptingExample.this);
-					ScriptingEnvironment.init(ScriptingExample.this, apkFilePath, ScriptingExample.this.getEngine());
-				} catch (final NameNotFoundException e) {
-					Debug.e(e);
-				}
+				AndEngineScriptingExtension.init(ScriptingExample.this, ScriptingExample.this.getEngine());
 
 				final Sprite rectangle = (Sprite)Test.test();
 
@@ -147,7 +136,14 @@ public void run() {
 
 	@Override
 	public void onClick(final View pView) {
-		/* Do sth. */
+		final String script = this.mEditTextCode.getText().toString();
+
+		this.runOnUpdateThread(new Runnable() {
+			@Override
+			public void run() {
+				AndEngineScriptingExtension.runScript(script);
+			}
+		});
 	}
 
 	// ===========================================================

From cd71689f897a9098117f47f0cf4348e99fac2931 Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Mon, 2 Apr 2012 14:51:40 -0700
Subject: [PATCH 14/17] Updated ScriptingExample.

---
 assets/js/scriptingexample.js                    |  6 +++++-
 src/org/andengine/examples/ScriptingExample.java | 10 +++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/assets/js/scriptingexample.js b/assets/js/scriptingexample.js
index 06584c4..80d4159 100644
--- a/assets/js/scriptingexample.js
+++ b/assets/js/scriptingexample.js
@@ -1,3 +1,7 @@
-var entity = new andengine.Entity(10, 20)
+var entity = new andengine.Entity(10, 20);
+
+entity.onAttached = function() {
+	return true;
+}
 
 entity.x = entity.y * 2;
\ No newline at end of file
diff --git a/src/org/andengine/examples/ScriptingExample.java b/src/org/andengine/examples/ScriptingExample.java
index 5d6fc53..6178599 100644
--- a/src/org/andengine/examples/ScriptingExample.java
+++ b/src/org/andengine/examples/ScriptingExample.java
@@ -7,6 +7,8 @@
 import org.andengine.engine.options.EngineOptions;
 import org.andengine.engine.options.EngineOptions.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
+import org.andengine.entity.IEntity;
+import org.andengine.entity.scene.ITouchArea;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
 import org.andengine.entity.sprite.Sprite;
@@ -125,11 +127,13 @@ public synchronized void onGameCreated() {
 			public void run() {
 				AndEngineScriptingExtension.init(ScriptingExample.this, ScriptingExample.this.getEngine());
 
-				final Sprite rectangle = (Sprite)Test.test();
+				final IEntity entity = (IEntity)Test.test();
 
 				final Scene scene = ScriptingExample.this.getEngine().getScene();
-				scene.attachChild(rectangle);
-				scene.registerTouchArea(rectangle);
+				scene.attachChild(entity);
+				if(entity instanceof ITouchArea) {
+					scene.registerTouchArea((ITouchArea)entity);
+				}
 			}
 		});
 	}

From cf46165205e98fff23d1ddeb11d48ac4bfd12d40 Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Wed, 4 Apr 2012 17:00:23 -0700
Subject: [PATCH 15/17] Changes due to AndEngine changes.

---
 src/org/andengine/examples/AnalogOnScreenControlExample.java   | 2 +-
 src/org/andengine/examples/AnalogOnScreenControlsExample.java  | 2 +-
 src/org/andengine/examples/AnimatedSpritesExample.java         | 2 +-
 src/org/andengine/examples/AsyncGameActivityExample.java       | 2 +-
 src/org/andengine/examples/AutoParallaxBackgroundExample.java  | 2 +-
 src/org/andengine/examples/BasePhysicsJointExample.java        | 2 +-
 src/org/andengine/examples/BitmapFontExample.java              | 2 +-
 src/org/andengine/examples/BoundCameraExample.java             | 2 +-
 src/org/andengine/examples/ButtonSpriteExample.java            | 2 +-
 .../andengine/examples/CanvasTextureCompositingExample.java    | 2 +-
 .../andengine/examples/CardinalSplineMoveModifierExample.java  | 2 +-
 src/org/andengine/examples/ChangeableTextExample.java          | 2 +-
 src/org/andengine/examples/CollisionDetectionExample.java      | 2 +-
 .../examples/ColorKeyTextureSourceDecoratorExample.java        | 2 +-
 src/org/andengine/examples/CoordinateConversionExample.java    | 2 +-
 src/org/andengine/examples/CustomFontExample.java              | 2 +-
 src/org/andengine/examples/DigitalOnScreenControlExample.java  | 2 +-
 src/org/andengine/examples/ETC1TextureExample.java             | 2 +-
 src/org/andengine/examples/EaseFunctionExample.java            | 2 +-
 src/org/andengine/examples/EntityModifierExample.java          | 2 +-
 src/org/andengine/examples/EntityModifierIrregularExample.java | 2 +-
 src/org/andengine/examples/HullAlgorithmExample.java           | 2 +-
 src/org/andengine/examples/ImageFormatsExample.java            | 2 +-
 src/org/andengine/examples/LevelLoaderExample.java             | 2 +-
 src/org/andengine/examples/LineExample.java                    | 2 +-
 src/org/andengine/examples/LoadTextureExample.java             | 2 +-
 src/org/andengine/examples/MenuExample.java                    | 2 +-
 src/org/andengine/examples/ModPlayerExample.java               | 2 +-
 src/org/andengine/examples/MotionStreakExample.java            | 2 +-
 src/org/andengine/examples/MovingBallExample.java              | 2 +-
 src/org/andengine/examples/MultiTouchExample.java              | 2 +-
 src/org/andengine/examples/MultiplayerBluetoothExample.java    | 2 +-
 src/org/andengine/examples/MultiplayerExample.java             | 2 +-
 .../andengine/examples/MultiplayerServerDiscoveryExample.java  | 2 +-
 src/org/andengine/examples/MusicExample.java                   | 2 +-
 src/org/andengine/examples/PVRCCZTextureExample.java           | 2 +-
 src/org/andengine/examples/PVRGZTextureExample.java            | 2 +-
 src/org/andengine/examples/PVRTextureExample.java              | 2 +-
 src/org/andengine/examples/ParticleSystemCoolExample.java      | 2 +-
 src/org/andengine/examples/ParticleSystemNexusExample.java     | 2 +-
 src/org/andengine/examples/ParticleSystemSimpleExample.java    | 2 +-
 src/org/andengine/examples/PathModifierExample.java            | 2 +-
 src/org/andengine/examples/PauseExample.java                   | 2 +-
 .../andengine/examples/PhysicsCollisionFilteringExample.java   | 2 +-
 src/org/andengine/examples/PhysicsExample.java                 | 2 +-
 src/org/andengine/examples/PhysicsFixedStepExample.java        | 2 +-
 src/org/andengine/examples/PhysicsJumpExample.java             | 2 +-
 src/org/andengine/examples/PhysicsMouseJointExample.java       | 2 +-
 src/org/andengine/examples/PhysicsRemoveExample.java           | 2 +-
 src/org/andengine/examples/PinchZoomExample.java               | 2 +-
 src/org/andengine/examples/RadialBlurExample.java              | 2 +-
 src/org/andengine/examples/RectangleExample.java               | 2 +-
 .../andengine/examples/RepeatingSpriteBackgroundExample.java   | 2 +-
 src/org/andengine/examples/Rotation3DExample.java              | 2 +-
 .../andengine/examples/RunnablePoolUpdateHandlerExample.java   | 2 +-
 src/org/andengine/examples/SVGTextureRegionExample.java        | 2 +-
 src/org/andengine/examples/ScreenCaptureExample.java           | 2 +-
 src/org/andengine/examples/ScriptingExample.java               | 3 +--
 src/org/andengine/examples/SoundExample.java                   | 2 +-
 src/org/andengine/examples/SplitScreenExample.java             | 2 +-
 src/org/andengine/examples/SpriteBatchExample.java             | 2 +-
 src/org/andengine/examples/SpriteExample.java                  | 2 +-
 src/org/andengine/examples/SpriteRemoveExample.java            | 2 +-
 src/org/andengine/examples/StrokeFontExample.java              | 2 +-
 src/org/andengine/examples/TMXTiledMapExample.java             | 2 +-
 src/org/andengine/examples/TextBreakExample.java               | 2 +-
 src/org/andengine/examples/TextExample.java                    | 2 +-
 src/org/andengine/examples/TextMenuExample.java                | 2 +-
 src/org/andengine/examples/TextureOptionsExample.java          | 2 +-
 src/org/andengine/examples/TexturePackerExample.java           | 2 +-
 src/org/andengine/examples/TickerTextExample.java              | 2 +-
 src/org/andengine/examples/TouchDragExample.java               | 2 +-
 src/org/andengine/examples/UnloadResourcesExample.java         | 2 +-
 src/org/andengine/examples/UpdateTextureExample.java           | 2 +-
 src/org/andengine/examples/XMLLayoutExample.java               | 2 +-
 src/org/andengine/examples/ZoomExample.java                    | 2 +-
 .../andengine/examples/app/cityradar/CityRadarActivity.java    | 2 +-
 src/org/andengine/examples/benchmark/AnimationBenchmark.java   | 2 +-
 .../andengine/examples/benchmark/AttachDetachBenchmark.java    | 2 +-
 .../andengine/examples/benchmark/EntityModifierBenchmark.java  | 2 +-
 src/org/andengine/examples/benchmark/PhysicsBenchmark.java     | 2 +-
 src/org/andengine/examples/benchmark/SpriteBenchmark.java      | 2 +-
 src/org/andengine/examples/benchmark/TickerTextBenchmark.java  | 2 +-
 src/org/andengine/examples/game/pong/PongGameActivity.java     | 2 +-
 src/org/andengine/examples/game/racer/RacerGameActivity.java   | 2 +-
 src/org/andengine/examples/game/snake/SnakeGameActivity.java   | 2 +-
 86 files changed, 86 insertions(+), 87 deletions(-)

diff --git a/src/org/andengine/examples/AnalogOnScreenControlExample.java b/src/org/andengine/examples/AnalogOnScreenControlExample.java
index b275d5e..e77b04d 100644
--- a/src/org/andengine/examples/AnalogOnScreenControlExample.java
+++ b/src/org/andengine/examples/AnalogOnScreenControlExample.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.hud.controls.BaseOnScreenControl;
 import org.andengine.engine.handler.physics.PhysicsHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.ScaleModifier;
 import org.andengine.entity.modifier.SequenceEntityModifier;
diff --git a/src/org/andengine/examples/AnalogOnScreenControlsExample.java b/src/org/andengine/examples/AnalogOnScreenControlsExample.java
index 424a04a..d1736ed 100644
--- a/src/org/andengine/examples/AnalogOnScreenControlsExample.java
+++ b/src/org/andengine/examples/AnalogOnScreenControlsExample.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.hud.controls.BaseOnScreenControl;
 import org.andengine.engine.handler.physics.PhysicsHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/AnimatedSpritesExample.java b/src/org/andengine/examples/AnimatedSpritesExample.java
index f664773..cdab404 100644
--- a/src/org/andengine/examples/AnimatedSpritesExample.java
+++ b/src/org/andengine/examples/AnimatedSpritesExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/AsyncGameActivityExample.java b/src/org/andengine/examples/AsyncGameActivityExample.java
index 39d63e8..aaf99b6 100644
--- a/src/org/andengine/examples/AsyncGameActivityExample.java
+++ b/src/org/andengine/examples/AsyncGameActivityExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/AutoParallaxBackgroundExample.java b/src/org/andengine/examples/AutoParallaxBackgroundExample.java
index 37df709..ac2a767 100644
--- a/src/org/andengine/examples/AutoParallaxBackgroundExample.java
+++ b/src/org/andengine/examples/AutoParallaxBackgroundExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.AutoParallaxBackground;
diff --git a/src/org/andengine/examples/BasePhysicsJointExample.java b/src/org/andengine/examples/BasePhysicsJointExample.java
index 002ee67..5f78243 100644
--- a/src/org/andengine/examples/BasePhysicsJointExample.java
+++ b/src/org/andengine/examples/BasePhysicsJointExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/BitmapFontExample.java b/src/org/andengine/examples/BitmapFontExample.java
index 9401d11..e4eb66e 100644
--- a/src/org/andengine/examples/BitmapFontExample.java
+++ b/src/org/andengine/examples/BitmapFontExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/BoundCameraExample.java b/src/org/andengine/examples/BoundCameraExample.java
index cbc3e37..825b1aa 100644
--- a/src/org/andengine/examples/BoundCameraExample.java
+++ b/src/org/andengine/examples/BoundCameraExample.java
@@ -5,7 +5,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.camera.hud.HUD;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.engine.splitscreen.SingleSceneSplitScreenEngine;
 import org.andengine.entity.primitive.Rectangle;
diff --git a/src/org/andengine/examples/ButtonSpriteExample.java b/src/org/andengine/examples/ButtonSpriteExample.java
index 67f4435..391cf90 100644
--- a/src/org/andengine/examples/ButtonSpriteExample.java
+++ b/src/org/andengine/examples/ButtonSpriteExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/CanvasTextureCompositingExample.java b/src/org/andengine/examples/CanvasTextureCompositingExample.java
index 2c8e918..17f3ac9 100644
--- a/src/org/andengine/examples/CanvasTextureCompositingExample.java
+++ b/src/org/andengine/examples/CanvasTextureCompositingExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.LoopEntityModifier;
 import org.andengine.entity.modifier.RotationModifier;
diff --git a/src/org/andengine/examples/CardinalSplineMoveModifierExample.java b/src/org/andengine/examples/CardinalSplineMoveModifierExample.java
index b0931c4..66eb18d 100644
--- a/src/org/andengine/examples/CardinalSplineMoveModifierExample.java
+++ b/src/org/andengine/examples/CardinalSplineMoveModifierExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.CardinalSplineMoveModifier;
 import org.andengine.entity.modifier.CardinalSplineMoveModifier.CardinalSplineMoveModifierConfig;
diff --git a/src/org/andengine/examples/ChangeableTextExample.java b/src/org/andengine/examples/ChangeableTextExample.java
index 9f5ef25..96f23a7 100644
--- a/src/org/andengine/examples/ChangeableTextExample.java
+++ b/src/org/andengine/examples/ChangeableTextExample.java
@@ -4,7 +4,7 @@
 import org.andengine.engine.handler.timer.ITimerCallback;
 import org.andengine.engine.handler.timer.TimerHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/CollisionDetectionExample.java b/src/org/andengine/examples/CollisionDetectionExample.java
index 495456c..ba21b4d 100644
--- a/src/org/andengine/examples/CollisionDetectionExample.java
+++ b/src/org/andengine/examples/CollisionDetectionExample.java
@@ -7,7 +7,7 @@
 import org.andengine.engine.handler.IUpdateHandler;
 import org.andengine.engine.handler.physics.PhysicsHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.LoopEntityModifier;
 import org.andengine.entity.modifier.ParallelEntityModifier;
diff --git a/src/org/andengine/examples/ColorKeyTextureSourceDecoratorExample.java b/src/org/andengine/examples/ColorKeyTextureSourceDecoratorExample.java
index e2c6b9c..12e7d54 100644
--- a/src/org/andengine/examples/ColorKeyTextureSourceDecoratorExample.java
+++ b/src/org/andengine/examples/ColorKeyTextureSourceDecoratorExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.sprite.Sprite;
diff --git a/src/org/andengine/examples/CoordinateConversionExample.java b/src/org/andengine/examples/CoordinateConversionExample.java
index 0a2a32e..ec6440f 100644
--- a/src/org/andengine/examples/CoordinateConversionExample.java
+++ b/src/org/andengine/examples/CoordinateConversionExample.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.hud.controls.BaseOnScreenControl;
 import org.andengine.engine.handler.physics.PhysicsHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.LoopEntityModifier;
 import org.andengine.entity.modifier.ScaleModifier;
diff --git a/src/org/andengine/examples/CustomFontExample.java b/src/org/andengine/examples/CustomFontExample.java
index b50aeae..0da3f82 100644
--- a/src/org/andengine/examples/CustomFontExample.java
+++ b/src/org/andengine/examples/CustomFontExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/DigitalOnScreenControlExample.java b/src/org/andengine/examples/DigitalOnScreenControlExample.java
index 958c53b..8fa900d 100644
--- a/src/org/andengine/examples/DigitalOnScreenControlExample.java
+++ b/src/org/andengine/examples/DigitalOnScreenControlExample.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.hud.controls.DigitalOnScreenControl;
 import org.andengine.engine.handler.physics.PhysicsHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/ETC1TextureExample.java b/src/org/andengine/examples/ETC1TextureExample.java
index a1ecc3b..f09e01e 100644
--- a/src/org/andengine/examples/ETC1TextureExample.java
+++ b/src/org/andengine/examples/ETC1TextureExample.java
@@ -5,7 +5,7 @@
 
 import org.andengine.engine.camera.SmoothCamera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/EaseFunctionExample.java b/src/org/andengine/examples/EaseFunctionExample.java
index 159335d..38e4b17 100644
--- a/src/org/andengine/examples/EaseFunctionExample.java
+++ b/src/org/andengine/examples/EaseFunctionExample.java
@@ -3,7 +3,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.camera.hud.HUD;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.MoveModifier;
 import org.andengine.entity.primitive.Line;
diff --git a/src/org/andengine/examples/EntityModifierExample.java b/src/org/andengine/examples/EntityModifierExample.java
index 05787cd..ead935d 100644
--- a/src/org/andengine/examples/EntityModifierExample.java
+++ b/src/org/andengine/examples/EntityModifierExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.IEntity;
 import org.andengine.entity.modifier.AlphaModifier;
diff --git a/src/org/andengine/examples/EntityModifierIrregularExample.java b/src/org/andengine/examples/EntityModifierIrregularExample.java
index de5cbb0..f74c228 100644
--- a/src/org/andengine/examples/EntityModifierIrregularExample.java
+++ b/src/org/andengine/examples/EntityModifierIrregularExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.IEntity;
 import org.andengine.entity.modifier.IEntityModifier.IEntityModifierListener;
diff --git a/src/org/andengine/examples/HullAlgorithmExample.java b/src/org/andengine/examples/HullAlgorithmExample.java
index 011768b..487755b 100644
--- a/src/org/andengine/examples/HullAlgorithmExample.java
+++ b/src/org/andengine/examples/HullAlgorithmExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.LoopEntityModifier;
 import org.andengine.entity.modifier.ScaleModifier;
diff --git a/src/org/andengine/examples/ImageFormatsExample.java b/src/org/andengine/examples/ImageFormatsExample.java
index 86e57ab..8b80f5b 100644
--- a/src/org/andengine/examples/ImageFormatsExample.java
+++ b/src/org/andengine/examples/ImageFormatsExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/LevelLoaderExample.java b/src/org/andengine/examples/LevelLoaderExample.java
index e86225d..ff559b0 100644
--- a/src/org/andengine/examples/LevelLoaderExample.java
+++ b/src/org/andengine/examples/LevelLoaderExample.java
@@ -4,7 +4,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/LineExample.java b/src/org/andengine/examples/LineExample.java
index 559aa04..f2f257d 100644
--- a/src/org/andengine/examples/LineExample.java
+++ b/src/org/andengine/examples/LineExample.java
@@ -4,7 +4,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Line;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/LoadTextureExample.java b/src/org/andengine/examples/LoadTextureExample.java
index 50e343d..82c9cd5 100644
--- a/src/org/andengine/examples/LoadTextureExample.java
+++ b/src/org/andengine/examples/LoadTextureExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/MenuExample.java b/src/org/andengine/examples/MenuExample.java
index 7c98eda..b8fdab9 100644
--- a/src/org/andengine/examples/MenuExample.java
+++ b/src/org/andengine/examples/MenuExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.MoveModifier;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/ModPlayerExample.java b/src/org/andengine/examples/ModPlayerExample.java
index f7e1ba8..8bffae7 100644
--- a/src/org/andengine/examples/ModPlayerExample.java
+++ b/src/org/andengine/examples/ModPlayerExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnAreaTouchListener;
 import org.andengine.entity.scene.ITouchArea;
diff --git a/src/org/andengine/examples/MotionStreakExample.java b/src/org/andengine/examples/MotionStreakExample.java
index d9fdd52..60fae93 100644
--- a/src/org/andengine/examples/MotionStreakExample.java
+++ b/src/org/andengine/examples/MotionStreakExample.java
@@ -3,7 +3,7 @@
 import org.andengine.engine.Engine;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.Entity;
 import org.andengine.entity.modifier.DelayModifier;
diff --git a/src/org/andengine/examples/MovingBallExample.java b/src/org/andengine/examples/MovingBallExample.java
index a5146b4..1c4f2d2 100644
--- a/src/org/andengine/examples/MovingBallExample.java
+++ b/src/org/andengine/examples/MovingBallExample.java
@@ -3,7 +3,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.handler.physics.PhysicsHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/MultiTouchExample.java b/src/org/andengine/examples/MultiTouchExample.java
index e1fbc8e..04ee468 100644
--- a/src/org/andengine/examples/MultiTouchExample.java
+++ b/src/org/andengine/examples/MultiTouchExample.java
@@ -4,7 +4,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/MultiplayerBluetoothExample.java b/src/org/andengine/examples/MultiplayerBluetoothExample.java
index d3207ec..471afc0 100644
--- a/src/org/andengine/examples/MultiplayerBluetoothExample.java
+++ b/src/org/andengine/examples/MultiplayerBluetoothExample.java
@@ -6,7 +6,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnAreaTouchListener;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/MultiplayerExample.java b/src/org/andengine/examples/MultiplayerExample.java
index cfaea5d..50be32c 100644
--- a/src/org/andengine/examples/MultiplayerExample.java
+++ b/src/org/andengine/examples/MultiplayerExample.java
@@ -8,7 +8,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnAreaTouchListener;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/MultiplayerServerDiscoveryExample.java b/src/org/andengine/examples/MultiplayerServerDiscoveryExample.java
index c4e448a..cbfcf97 100644
--- a/src/org/andengine/examples/MultiplayerServerDiscoveryExample.java
+++ b/src/org/andengine/examples/MultiplayerServerDiscoveryExample.java
@@ -10,7 +10,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnAreaTouchListener;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/MusicExample.java b/src/org/andengine/examples/MusicExample.java
index 7ebae82..e9ced3f 100644
--- a/src/org/andengine/examples/MusicExample.java
+++ b/src/org/andengine/examples/MusicExample.java
@@ -6,7 +6,7 @@
 import org.andengine.audio.music.MusicFactory;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnAreaTouchListener;
 import org.andengine.entity.scene.ITouchArea;
diff --git a/src/org/andengine/examples/PVRCCZTextureExample.java b/src/org/andengine/examples/PVRCCZTextureExample.java
index 35c47ac..9d1a41e 100644
--- a/src/org/andengine/examples/PVRCCZTextureExample.java
+++ b/src/org/andengine/examples/PVRCCZTextureExample.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.camera.SmoothCamera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/PVRGZTextureExample.java b/src/org/andengine/examples/PVRGZTextureExample.java
index a1c8376..a1e2985 100644
--- a/src/org/andengine/examples/PVRGZTextureExample.java
+++ b/src/org/andengine/examples/PVRGZTextureExample.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.camera.SmoothCamera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/PVRTextureExample.java b/src/org/andengine/examples/PVRTextureExample.java
index 9542a6a..126d89b 100644
--- a/src/org/andengine/examples/PVRTextureExample.java
+++ b/src/org/andengine/examples/PVRTextureExample.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.camera.SmoothCamera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.Entity;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/ParticleSystemCoolExample.java b/src/org/andengine/examples/ParticleSystemCoolExample.java
index 6390137..25fce34 100644
--- a/src/org/andengine/examples/ParticleSystemCoolExample.java
+++ b/src/org/andengine/examples/ParticleSystemCoolExample.java
@@ -3,7 +3,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.particle.SpriteParticleSystem;
 import org.andengine.entity.particle.emitter.PointParticleEmitter;
diff --git a/src/org/andengine/examples/ParticleSystemNexusExample.java b/src/org/andengine/examples/ParticleSystemNexusExample.java
index ea1a35a..9e74d82 100644
--- a/src/org/andengine/examples/ParticleSystemNexusExample.java
+++ b/src/org/andengine/examples/ParticleSystemNexusExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.particle.SpriteParticleSystem;
 import org.andengine.entity.particle.emitter.PointParticleEmitter;
diff --git a/src/org/andengine/examples/ParticleSystemSimpleExample.java b/src/org/andengine/examples/ParticleSystemSimpleExample.java
index 640b7aa..d8ff6cd 100644
--- a/src/org/andengine/examples/ParticleSystemSimpleExample.java
+++ b/src/org/andengine/examples/ParticleSystemSimpleExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.particle.SpriteParticleSystem;
 import org.andengine.entity.particle.emitter.CircleOutlineParticleEmitter;
diff --git a/src/org/andengine/examples/PathModifierExample.java b/src/org/andengine/examples/PathModifierExample.java
index 2aac9a4..c1b44aa 100644
--- a/src/org/andengine/examples/PathModifierExample.java
+++ b/src/org/andengine/examples/PathModifierExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.IEntity;
 import org.andengine.entity.modifier.LoopEntityModifier;
diff --git a/src/org/andengine/examples/PauseExample.java b/src/org/andengine/examples/PauseExample.java
index 64c6871..d9f0fcd 100644
--- a/src/org/andengine/examples/PauseExample.java
+++ b/src/org/andengine/examples/PauseExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.MoveModifier;
 import org.andengine.entity.scene.CameraScene;
diff --git a/src/org/andengine/examples/PhysicsCollisionFilteringExample.java b/src/org/andengine/examples/PhysicsCollisionFilteringExample.java
index 637dc46..d924baa 100644
--- a/src/org/andengine/examples/PhysicsCollisionFilteringExample.java
+++ b/src/org/andengine/examples/PhysicsCollisionFilteringExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/PhysicsExample.java b/src/org/andengine/examples/PhysicsExample.java
index b6e2dc3..95a4e1a 100644
--- a/src/org/andengine/examples/PhysicsExample.java
+++ b/src/org/andengine/examples/PhysicsExample.java
@@ -4,7 +4,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/PhysicsFixedStepExample.java b/src/org/andengine/examples/PhysicsFixedStepExample.java
index 74b0b0a..05237ff 100644
--- a/src/org/andengine/examples/PhysicsFixedStepExample.java
+++ b/src/org/andengine/examples/PhysicsFixedStepExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/PhysicsJumpExample.java b/src/org/andengine/examples/PhysicsJumpExample.java
index 5690872..02e3162 100644
--- a/src/org/andengine/examples/PhysicsJumpExample.java
+++ b/src/org/andengine/examples/PhysicsJumpExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnAreaTouchListener;
diff --git a/src/org/andengine/examples/PhysicsMouseJointExample.java b/src/org/andengine/examples/PhysicsMouseJointExample.java
index c0c9a2c..295ab8d 100644
--- a/src/org/andengine/examples/PhysicsMouseJointExample.java
+++ b/src/org/andengine/examples/PhysicsMouseJointExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnAreaTouchListener;
diff --git a/src/org/andengine/examples/PhysicsRemoveExample.java b/src/org/andengine/examples/PhysicsRemoveExample.java
index b8f3d45..eb44487 100644
--- a/src/org/andengine/examples/PhysicsRemoveExample.java
+++ b/src/org/andengine/examples/PhysicsRemoveExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnAreaTouchListener;
diff --git a/src/org/andengine/examples/PinchZoomExample.java b/src/org/andengine/examples/PinchZoomExample.java
index 17f9a2b..ed158b0 100644
--- a/src/org/andengine/examples/PinchZoomExample.java
+++ b/src/org/andengine/examples/PinchZoomExample.java
@@ -4,7 +4,7 @@
 
 import org.andengine.engine.camera.ZoomCamera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/RadialBlurExample.java b/src/org/andengine/examples/RadialBlurExample.java
index 07f7657..3ec7c20 100644
--- a/src/org/andengine/examples/RadialBlurExample.java
+++ b/src/org/andengine/examples/RadialBlurExample.java
@@ -3,7 +3,7 @@
 import org.andengine.engine.Engine;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/RectangleExample.java b/src/org/andengine/examples/RectangleExample.java
index ce34e7e..57dc702 100644
--- a/src/org/andengine/examples/RectangleExample.java
+++ b/src/org/andengine/examples/RectangleExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.Entity;
 import org.andengine.entity.primitive.Rectangle;
diff --git a/src/org/andengine/examples/RepeatingSpriteBackgroundExample.java b/src/org/andengine/examples/RepeatingSpriteBackgroundExample.java
index 7cbc4ab..e6b883e 100644
--- a/src/org/andengine/examples/RepeatingSpriteBackgroundExample.java
+++ b/src/org/andengine/examples/RepeatingSpriteBackgroundExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.IEntity;
 import org.andengine.entity.modifier.LoopEntityModifier;
diff --git a/src/org/andengine/examples/Rotation3DExample.java b/src/org/andengine/examples/Rotation3DExample.java
index e660ae2..fd2f0a7 100644
--- a/src/org/andengine/examples/Rotation3DExample.java
+++ b/src/org/andengine/examples/Rotation3DExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.LoopEntityModifier;
 import org.andengine.entity.modifier.RotationModifier;
diff --git a/src/org/andengine/examples/RunnablePoolUpdateHandlerExample.java b/src/org/andengine/examples/RunnablePoolUpdateHandlerExample.java
index 13d30d0..bfc131c 100644
--- a/src/org/andengine/examples/RunnablePoolUpdateHandlerExample.java
+++ b/src/org/andengine/examples/RunnablePoolUpdateHandlerExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/SVGTextureRegionExample.java b/src/org/andengine/examples/SVGTextureRegionExample.java
index d9bdb4c..4328156 100644
--- a/src/org/andengine/examples/SVGTextureRegionExample.java
+++ b/src/org/andengine/examples/SVGTextureRegionExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/ScreenCaptureExample.java b/src/org/andengine/examples/ScreenCaptureExample.java
index 1650a4b..9d9dae0 100644
--- a/src/org/andengine/examples/ScreenCaptureExample.java
+++ b/src/org/andengine/examples/ScreenCaptureExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.Entity;
 import org.andengine.entity.modifier.LoopEntityModifier;
diff --git a/src/org/andengine/examples/ScriptingExample.java b/src/org/andengine/examples/ScriptingExample.java
index 6178599..31ffd9e 100644
--- a/src/org/andengine/examples/ScriptingExample.java
+++ b/src/org/andengine/examples/ScriptingExample.java
@@ -5,13 +5,12 @@
 import org.andengine.engine.Engine;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.IEntity;
 import org.andengine.entity.scene.ITouchArea;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
-import org.andengine.entity.sprite.Sprite;
 import org.andengine.entity.util.FPSLogger;
 import org.andengine.extension.scripting.AndEngineScriptingExtension;
 import org.andengine.extension.scripting.Test;
diff --git a/src/org/andengine/examples/SoundExample.java b/src/org/andengine/examples/SoundExample.java
index 050eb22..336ef18 100644
--- a/src/org/andengine/examples/SoundExample.java
+++ b/src/org/andengine/examples/SoundExample.java
@@ -6,7 +6,7 @@
 import org.andengine.audio.sound.SoundFactory;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnAreaTouchListener;
 import org.andengine.entity.scene.ITouchArea;
diff --git a/src/org/andengine/examples/SplitScreenExample.java b/src/org/andengine/examples/SplitScreenExample.java
index 1a4b3c0..5f81af7 100644
--- a/src/org/andengine/examples/SplitScreenExample.java
+++ b/src/org/andengine/examples/SplitScreenExample.java
@@ -4,7 +4,7 @@
 import org.andengine.engine.camera.BoundCamera;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.engine.splitscreen.SingleSceneSplitScreenEngine;
 import org.andengine.entity.primitive.Rectangle;
diff --git a/src/org/andengine/examples/SpriteBatchExample.java b/src/org/andengine/examples/SpriteBatchExample.java
index 71823a2..185817a 100644
--- a/src/org/andengine/examples/SpriteBatchExample.java
+++ b/src/org/andengine/examples/SpriteBatchExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/SpriteExample.java b/src/org/andengine/examples/SpriteExample.java
index 1e368be..5ab984a 100644
--- a/src/org/andengine/examples/SpriteExample.java
+++ b/src/org/andengine/examples/SpriteExample.java
@@ -5,7 +5,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/SpriteRemoveExample.java b/src/org/andengine/examples/SpriteRemoveExample.java
index 3d482ee..cd45954 100644
--- a/src/org/andengine/examples/SpriteRemoveExample.java
+++ b/src/org/andengine/examples/SpriteRemoveExample.java
@@ -3,7 +3,7 @@
 import org.andengine.engine.Engine.EngineLock;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/StrokeFontExample.java b/src/org/andengine/examples/StrokeFontExample.java
index 24b98da..af2d0ad 100644
--- a/src/org/andengine/examples/StrokeFontExample.java
+++ b/src/org/andengine/examples/StrokeFontExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/TMXTiledMapExample.java b/src/org/andengine/examples/TMXTiledMapExample.java
index cf46a7d..78c875b 100644
--- a/src/org/andengine/examples/TMXTiledMapExample.java
+++ b/src/org/andengine/examples/TMXTiledMapExample.java
@@ -3,7 +3,7 @@
 import org.andengine.engine.camera.BoundCamera;
 import org.andengine.engine.handler.IUpdateHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.IEntity;
 import org.andengine.entity.modifier.LoopEntityModifier;
diff --git a/src/org/andengine/examples/TextBreakExample.java b/src/org/andengine/examples/TextBreakExample.java
index 4621fc1..c36b877 100644
--- a/src/org/andengine/examples/TextBreakExample.java
+++ b/src/org/andengine/examples/TextBreakExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Line;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/TextExample.java b/src/org/andengine/examples/TextExample.java
index e68056f..995f0c4 100644
--- a/src/org/andengine/examples/TextExample.java
+++ b/src/org/andengine/examples/TextExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/TextMenuExample.java b/src/org/andengine/examples/TextMenuExample.java
index 2788c32..fa88d32 100644
--- a/src/org/andengine/examples/TextMenuExample.java
+++ b/src/org/andengine/examples/TextMenuExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.MoveModifier;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/TextureOptionsExample.java b/src/org/andengine/examples/TextureOptionsExample.java
index abc5484..91d2a39 100644
--- a/src/org/andengine/examples/TextureOptionsExample.java
+++ b/src/org/andengine/examples/TextureOptionsExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/TexturePackerExample.java b/src/org/andengine/examples/TexturePackerExample.java
index e99a6ca..764bb56 100644
--- a/src/org/andengine/examples/TexturePackerExample.java
+++ b/src/org/andengine/examples/TexturePackerExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/TickerTextExample.java b/src/org/andengine/examples/TickerTextExample.java
index f356b2a..e0e3daf 100644
--- a/src/org/andengine/examples/TickerTextExample.java
+++ b/src/org/andengine/examples/TickerTextExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.AlphaModifier;
 import org.andengine.entity.modifier.ParallelEntityModifier;
diff --git a/src/org/andengine/examples/TouchDragExample.java b/src/org/andengine/examples/TouchDragExample.java
index 9056b4f..dbb43fd 100644
--- a/src/org/andengine/examples/TouchDragExample.java
+++ b/src/org/andengine/examples/TouchDragExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/UnloadResourcesExample.java b/src/org/andengine/examples/UnloadResourcesExample.java
index 95c5477..a1a14fc 100644
--- a/src/org/andengine/examples/UnloadResourcesExample.java
+++ b/src/org/andengine/examples/UnloadResourcesExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/UpdateTextureExample.java b/src/org/andengine/examples/UpdateTextureExample.java
index 996382a..bab6010 100644
--- a/src/org/andengine/examples/UpdateTextureExample.java
+++ b/src/org/andengine/examples/UpdateTextureExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/XMLLayoutExample.java b/src/org/andengine/examples/XMLLayoutExample.java
index 73dbbb9..531b303 100644
--- a/src/org/andengine/examples/XMLLayoutExample.java
+++ b/src/org/andengine/examples/XMLLayoutExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.particle.SpriteParticleSystem;
 import org.andengine.entity.particle.emitter.CircleOutlineParticleEmitter;
diff --git a/src/org/andengine/examples/ZoomExample.java b/src/org/andengine/examples/ZoomExample.java
index e5c87be..4cbd19f 100644
--- a/src/org/andengine/examples/ZoomExample.java
+++ b/src/org/andengine/examples/ZoomExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.SmoothCamera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/app/cityradar/CityRadarActivity.java b/src/org/andengine/examples/app/cityradar/CityRadarActivity.java
index 847e507..75e4e90 100644
--- a/src/org/andengine/examples/app/cityradar/CityRadarActivity.java
+++ b/src/org/andengine/examples/app/cityradar/CityRadarActivity.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.camera.hud.HUD;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.FillResolutionPolicy;
 import org.andengine.entity.IEntity;
 import org.andengine.entity.modifier.LoopEntityModifier;
diff --git a/src/org/andengine/examples/benchmark/AnimationBenchmark.java b/src/org/andengine/examples/benchmark/AnimationBenchmark.java
index 24fee93..7647a79 100644
--- a/src/org/andengine/examples/benchmark/AnimationBenchmark.java
+++ b/src/org/andengine/examples/benchmark/AnimationBenchmark.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/benchmark/AttachDetachBenchmark.java b/src/org/andengine/examples/benchmark/AttachDetachBenchmark.java
index 841ce37..8e85a5e 100644
--- a/src/org/andengine/examples/benchmark/AttachDetachBenchmark.java
+++ b/src/org/andengine/examples/benchmark/AttachDetachBenchmark.java
@@ -4,7 +4,7 @@
 import org.andengine.engine.handler.timer.ITimerCallback;
 import org.andengine.engine.handler.timer.TimerHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/benchmark/EntityModifierBenchmark.java b/src/org/andengine/examples/benchmark/EntityModifierBenchmark.java
index 50cc37b..d35818f 100644
--- a/src/org/andengine/examples/benchmark/EntityModifierBenchmark.java
+++ b/src/org/andengine/examples/benchmark/EntityModifierBenchmark.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.AlphaModifier;
 import org.andengine.entity.modifier.DelayModifier;
diff --git a/src/org/andengine/examples/benchmark/PhysicsBenchmark.java b/src/org/andengine/examples/benchmark/PhysicsBenchmark.java
index b93bfef..6328d91 100644
--- a/src/org/andengine/examples/benchmark/PhysicsBenchmark.java
+++ b/src/org/andengine/examples/benchmark/PhysicsBenchmark.java
@@ -4,7 +4,7 @@
 import org.andengine.engine.handler.timer.ITimerCallback;
 import org.andengine.engine.handler.timer.TimerHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/benchmark/SpriteBenchmark.java b/src/org/andengine/examples/benchmark/SpriteBenchmark.java
index 388d88f..76080f3 100644
--- a/src/org/andengine/examples/benchmark/SpriteBenchmark.java
+++ b/src/org/andengine/examples/benchmark/SpriteBenchmark.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.AlphaModifier;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/benchmark/TickerTextBenchmark.java b/src/org/andengine/examples/benchmark/TickerTextBenchmark.java
index 4e88a2d..fb37239 100644
--- a/src/org/andengine/examples/benchmark/TickerTextBenchmark.java
+++ b/src/org/andengine/examples/benchmark/TickerTextBenchmark.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/game/pong/PongGameActivity.java b/src/org/andengine/examples/game/pong/PongGameActivity.java
index 856680f..db8f466 100644
--- a/src/org/andengine/examples/game/pong/PongGameActivity.java
+++ b/src/org/andengine/examples/game/pong/PongGameActivity.java
@@ -9,7 +9,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.handler.IUpdateHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Line;
 import org.andengine.entity.primitive.Rectangle;
diff --git a/src/org/andengine/examples/game/racer/RacerGameActivity.java b/src/org/andengine/examples/game/racer/RacerGameActivity.java
index 83763c3..fad95f5 100644
--- a/src/org/andengine/examples/game/racer/RacerGameActivity.java
+++ b/src/org/andengine/examples/game/racer/RacerGameActivity.java
@@ -5,7 +5,7 @@
 import org.andengine.engine.camera.hud.controls.AnalogOnScreenControl.IAnalogOnScreenControlListener;
 import org.andengine.engine.camera.hud.controls.BaseOnScreenControl;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/game/snake/SnakeGameActivity.java b/src/org/andengine/examples/game/snake/SnakeGameActivity.java
index 973510c..950a252 100644
--- a/src/org/andengine/examples/game/snake/SnakeGameActivity.java
+++ b/src/org/andengine/examples/game/snake/SnakeGameActivity.java
@@ -11,7 +11,7 @@
 import org.andengine.engine.handler.timer.ITimerCallback;
 import org.andengine.engine.handler.timer.TimerHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.Entity;
 import org.andengine.entity.modifier.RotationModifier;

From 073d88e3db2785d112bcb92a781d0fb5316dad13 Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Thu, 16 May 2013 20:14:20 -0600
Subject: [PATCH 16/17] Updated .gitignore for future Android Studio support.

---
 .gitignore | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4cc7203..8a4b911 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,30 @@
+# System:
+Thumbs.db
+.DS_Store
+*.swp
+*~
+Desktop.ini
+
+# Version Control Systems:
+.svn
+CVS
+.hg
+.bzr
+
+# Android:
+local.properties
+proguard/**
 target/**
 bin/**
+obj/**
 doc/**
 gen/**
-.DS_Store
-Thumbs.db
 gdb.setup
 gdbserver
-.svn
-.hg
-local.properties
+
+# Eclipse:
 .settings
-AndEngineExamples.iml
\ No newline at end of file
+
+# IntelliJ / Android Studio:
+idea/workspace.xml
+idea/tasks.xml

From 9efedeca2fe9fec0eebfd1559bb620e5e9463df2 Mon Sep 17 00:00:00 2001
From: Nicolas Gramlich <ngramlich@zynga.com>
Date: Sat, 8 Jun 2013 17:16:37 -0600
Subject: [PATCH 17/17] Added crashlytics xml file to gitignore.

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8a4b911..c71b14c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@ gdbserver
 # IntelliJ / Android Studio:
 idea/workspace.xml
 idea/tasks.xml
+
+# Crashlytics
+res/values/com_crashlytics_export_strings.xml