diff options
| author | Cameron Cawley | 2019-09-08 19:37:48 +0100 |
|---|---|---|
| committer | GitHub | 2019-09-08 19:37:48 +0100 |
| commit | 7a05624e1b3371a2823a46749083fe4bc9eb4a60 (patch) | |
| tree | bbea40660b338a7f830a15a0d9d1a18ed283ccb5 /backends/platform/android/org | |
| parent | 997e15878ad72e773ca3835b756daf02d0f7334d (diff) | |
| download | scummvm-rg350-7a05624e1b3371a2823a46749083fe4bc9eb4a60.tar.gz scummvm-rg350-7a05624e1b3371a2823a46749083fe4bc9eb4a60.tar.bz2 scummvm-rg350-7a05624e1b3371a2823a46749083fe4bc9eb4a60.zip | |
ANDROID: Rewrite to make use of OpenGLGraphicsManager (#1695)
* ANDROID: Rewrite to make use of OpenGLGraphicsManager
* ANDROID: Fix emulated mouse button up events
Diffstat (limited to 'backends/platform/android/org')
| -rw-r--r-- | backends/platform/android/org/scummvm/scummvm/ScummVM.java | 1 | ||||
| -rw-r--r-- | backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java | 22 |
2 files changed, 0 insertions, 23 deletions
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVM.java b/backends/platform/android/org/scummvm/scummvm/ScummVM.java index 37fe76ebda..2784623449 100644 --- a/backends/platform/android/org/scummvm/scummvm/ScummVM.java +++ b/backends/platform/android/org/scummvm/scummvm/ScummVM.java @@ -45,7 +45,6 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable { // pause the engine and all native threads final public native void setPause(boolean pause); - final public native void enableZoning(boolean enable); // Feed an event to ScummVM. Safe to call from other threads. final public native void pushEvent(int type, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6); diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java index 7bb0fe8057..f353ceab27 100644 --- a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java +++ b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java @@ -53,30 +53,8 @@ public class ScummVMActivity extends Activity { }; private class MyScummVM extends ScummVM { - private boolean usingSmallScreen() { - // Multiple screen sizes came in with Android 1.6. Have - // to use reflection in order to continue supporting 1.5 - // devices :( - DisplayMetrics metrics = new DisplayMetrics(); - getWindowManager().getDefaultDisplay().getMetrics(metrics); - - try { - // This 'density' term is very confusing. - int DENSITY_LOW = metrics.getClass().getField("DENSITY_LOW").getInt(null); - int densityDpi = metrics.getClass().getField("densityDpi").getInt(metrics); - return densityDpi <= DENSITY_LOW; - } catch (Exception e) { - return false; - } - } - public MyScummVM(SurfaceHolder holder) { super(ScummVMActivity.this.getAssets(), holder); - - // Enable ScummVM zoning on 'small' screens. - // FIXME make this optional for the user - // disabled for now since it crops too much - //enableZoning(usingSmallScreen()); } @Override |