Merge origin/master

experimental
Normen Hansen 10 years ago
commit 2ba85e288f
  1. 15
      jme3-android/src/main/java/com/jme3/app/AndroidHarness.java

@ -166,17 +166,14 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
* splashPicID = 0, then no splash screen will be displayed. * splashPicID = 0, then no splash screen will be displayed.
*/ */
protected int splashPicID = 0; protected int splashPicID = 0;
/** /**
* Set the screen orientation, default is SENSOR * No longer used - Use the android:screenOrientation declaration in
* ActivityInfo.SCREEN_ORIENTATION_* constants package * the AndroidManifest.xml file.
* android.content.pm.ActivityInfo
*
* SCREEN_ORIENTATION_UNSPECIFIED SCREEN_ORIENTATION_LANDSCAPE
* SCREEN_ORIENTATION_PORTRAIT SCREEN_ORIENTATION_USER
* SCREEN_ORIENTATION_BEHIND SCREEN_ORIENTATION_SENSOR (default)
* SCREEN_ORIENTATION_NOSENSOR
*/ */
@Deprecated
protected int screenOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR; protected int screenOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR;
protected OGLESContext ctx; protected OGLESContext ctx;
protected GLSurfaceView view = null; protected GLSurfaceView view = null;
protected boolean isGLThreadPaused = true; protected boolean isGLThreadPaused = true;
@ -216,8 +213,6 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
} }
} }
setRequestedOrientation(screenOrientation);
final DataObject data = (DataObject) getLastNonConfigurationInstance(); final DataObject data = (DataObject) getLastNonConfigurationInstance();
if (data != null) { if (data != null) {
logger.log(Level.FINE, "Using Retained App"); logger.log(Level.FINE, "Using Retained App");

Loading…
Cancel
Save