Commit 40f66fc1 authored by Evan W. Patton's avatar Evan W. Patton Committed by Jeffrey Schiller

Fix accelerometer crashing emulator if UseLegacy is off

Change-Id: I0aa290a74d286d6f8681b4698ea7c6212b36ecb6
parent f071ee04
...@@ -7,18 +7,6 @@ ...@@ -7,18 +7,6 @@
package com.google.appinventor.components.runtime; package com.google.appinventor.components.runtime;
import com.google.appinventor.components.annotations.DesignerComponent;
import com.google.appinventor.components.annotations.DesignerProperty;
import com.google.appinventor.components.annotations.PropertyCategory;
import com.google.appinventor.components.annotations.SimpleEvent;
import com.google.appinventor.components.annotations.SimpleFunction;
import com.google.appinventor.components.annotations.SimpleObject;
import com.google.appinventor.components.annotations.SimpleProperty;
import com.google.appinventor.components.common.ComponentCategory;
import com.google.appinventor.components.common.PropertyTypeConstants;
import com.google.appinventor.components.common.YaVersion;
import com.google.appinventor.components.runtime.util.ErrorMessages;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
...@@ -26,13 +14,22 @@ import android.hardware.Sensor; ...@@ -26,13 +14,22 @@ import android.hardware.Sensor;
import android.hardware.SensorEvent; import android.hardware.SensorEvent;
import android.hardware.SensorEventListener; import android.hardware.SensorEventListener;
import android.hardware.SensorManager; import android.hardware.SensorManager;
import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.util.Log; import android.util.Log;
import android.view.Surface; import android.view.Surface;
import android.view.WindowManager; import android.view.WindowManager;
import com.google.appinventor.components.annotations.DesignerComponent;
import com.google.appinventor.components.annotations.DesignerProperty;
import com.google.appinventor.components.annotations.PropertyCategory;
import com.google.appinventor.components.annotations.SimpleEvent;
import com.google.appinventor.components.annotations.SimpleObject;
import com.google.appinventor.components.annotations.SimpleProperty;
import com.google.appinventor.components.common.ComponentCategory;
import com.google.appinventor.components.common.PropertyTypeConstants;
import com.google.appinventor.components.common.YaVersion;
import com.google.appinventor.components.runtime.util.ErrorMessages;
import com.google.appinventor.components.runtime.util.SdkLevel;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
...@@ -255,6 +252,11 @@ public class AccelerometerSensor extends AndroidNonvisibleComponent ...@@ -255,6 +252,11 @@ public class AccelerometerSensor extends AndroidNonvisibleComponent
} }
public int getDeviceDefaultOrientation() { public int getDeviceDefaultOrientation() {
if (Build.VERSION.SDK_INT < SdkLevel.LEVEL_FROYO) {
// getRotation() is unavailable on versions of Android lower tha Froyo, so assume a default
// orientation of PORTRAIT (which was the implied assumption before we added this check).
return Configuration.ORIENTATION_PORTRAIT;
}
Configuration config = resources.getConfiguration(); Configuration config = resources.getConfiguration();
int rotation = windowManager.getDefaultDisplay().getRotation(); int rotation = windowManager.getDefaultDisplay().getRotation();
if (DEBUG) { if (DEBUG) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment