tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#934 - Consolidating CallbackHandler due to API minimum being above Gingerbread

Browse Source
This commit is contained in:
Brad Leege
2015-08-21 15:51:26 -05:00
parent a07fe3aecd
commit e91c21c284
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
View File

@@ -57,7 +57,6 @@ import com.mapzen.android.lost.api.LocationRequest;
import com.mapzen.android.lost.api.LocationServices;
import com.mapzen.android.lost.api.LostApiClient;
import com.squareup.okhttp.HttpUrl;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
@@ -249,11 +248,7 @@ public class MapView extends FrameLayout implements LocationListener {
requestFocus();
// Register the SurfaceHolder callbacks
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
surfaceView.getHolder().addCallback(new Callbacks2());
} else {
surfaceView.getHolder().addCallback(new Callbacks());
}
surfaceView.getHolder().addCallback(new CallbacksHandler());
// Touch gesture detectors
mGestureDetector = new GestureDetectorCompat(context, new GestureListener());
@@ -749,7 +744,7 @@ public class MapView extends FrameLayout implements LocationListener {
}
// This class handles SurfaceHolder callbacks
private class Callbacks implements SurfaceHolder.Callback {
private class CallbacksHandler implements SurfaceHolder.Callback, SurfaceHolder.Callback2 {
// Called when the native surface buffer has been created
// Must do all EGL/GL ES initialization here
@@ -772,9 +767,6 @@ public class MapView extends FrameLayout implements LocationListener {
public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
mNativeMapView.resizeFramebuffer(width, height);
}
}
private class Callbacks2 extends Callbacks implements SurfaceHolder.Callback2 {
// Called when we need to redraw the view
// This is called before our view is first visible to prevent an initial