miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed crashing on Gingerbread

Browse Source
This commit is contained in:
pelya
2012-02-29 15:42:22 +02:00
parent fe04eaacef
commit 300b16a1c0
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
project/java/Video.java
View File

@@ -104,13 +104,23 @@ abstract class DifferentTouchInput
if( m.getName().equals("getPointerId") )
multiTouchAvailable2 = true;
}
if( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD )
return XperiaMiniTouchpadTouchInput.Holder.sInstance;
if (multiTouchAvailable1 && multiTouchAvailable2)
return MultiTouchInput.Holder.sInstance;
else
return SingleTouchInput.Holder.sInstance;
try {
if( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD )
return XperiaMiniTouchpadTouchInput.Holder.sInstance;
if (multiTouchAvailable1 && multiTouchAvailable2)
return MultiTouchInput.Holder.sInstance;
else
return SingleTouchInput.Holder.sInstance;
} catch( java.lang.NoSuchMethodError e ) {
try {
if (multiTouchAvailable1 && multiTouchAvailable2)
return MultiTouchInput.Holder.sInstance;
else
return SingleTouchInput.Holder.sInstance;
} catch( java.lang.NoSuchMethodError e ) {
return SingleTouchInput.Holder.sInstance;
}
}
}
public abstract void process(final MotionEvent event);
public abstract void processGenericEvent(final MotionEvent event);
@@ -301,14 +311,14 @@ abstract class DifferentTouchInput
if( (device.getSources() & InputDevice.SOURCE_TOUCHPAD) != InputDevice.SOURCE_TOUCHPAD )
continue;
System.out.println("libSDL: input device ID " + id + " type " + device.getSources() + " name " + device.getName() + " is a touchpad" );
InputDevice.MotionRange range = device.getMotionRange(MotionEvent.AXIS_X, InputDevice.SOURCE_TOUCHPAD);
InputDevice.MotionRange range = device.getMotionRange(MotionEvent.AXIS_X);
if(range != null)
{
xmin = range.getMin();
xmax = range.getMax() - range.getMin();
System.out.println("libSDL: touch pad X range " + xmin + ":" + xmax );
}
range = device.getMotionRange(MotionEvent.AXIS_Y, InputDevice.SOURCE_TOUCHPAD);
range = device.getMotionRange(MotionEvent.AXIS_Y);
if(range != null)
{
ymin = range.getMin();