From b6d6e4c6639e59d1d8342961c89154157915184b Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Thu, 20 Aug 2015 11:12:14 -0500 Subject: [PATCH 1/5] #934 - Raising Min SDK to API 10 --- android/java/MapboxGLAndroidSDK/gradle.properties | 2 +- android/java/MapboxGLAndroidSDKTestApp/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/java/MapboxGLAndroidSDK/gradle.properties b/android/java/MapboxGLAndroidSDK/gradle.properties index a441dfd27..dd24c0ff6 100644 --- a/android/java/MapboxGLAndroidSDK/gradle.properties +++ b/android/java/MapboxGLAndroidSDK/gradle.properties @@ -12,7 +12,7 @@ POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mapbox POM_DEVELOPER_NAME=Mapbox -ANDROID_MIN_SDK=8 +ANDROID_MIN_SDK=10 ANDROID_BUILD_TARGET_SDK_VERSION=23 ANDROID_BUILD_TOOLS_VERSION=23 ANDROID_BUILD_SDK_VERSION=23 diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle index 72dfdaa0c..660720b00 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle +++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle @@ -47,7 +47,7 @@ android { defaultConfig { applicationId "com.mapbox.mapboxgl.testapp" - minSdkVersion 8 + minSdkVersion 10 targetSdkVersion 23 versionCode 4 versionName "0.1.3" From a07fe3aecdf79f1fcaaedb01928bc311c67ca37a Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Fri, 21 Aug 2015 15:46:16 -0500 Subject: [PATCH 2/5] #934 - Setting SDK Minimum to API 15. Removing TargetApi Annotations. --- android/java/MapboxGLAndroidSDK/gradle.properties | 2 +- .../java/com/mapbox/mapboxgl/views/MapView.java | 13 +++++-------- android/java/MapboxGLAndroidSDKTestApp/build.gradle | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/android/java/MapboxGLAndroidSDK/gradle.properties b/android/java/MapboxGLAndroidSDK/gradle.properties index dd24c0ff6..5d862987b 100644 --- a/android/java/MapboxGLAndroidSDK/gradle.properties +++ b/android/java/MapboxGLAndroidSDK/gradle.properties @@ -12,7 +12,7 @@ POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mapbox POM_DEVELOPER_NAME=Mapbox -ANDROID_MIN_SDK=10 +ANDROID_MIN_SDK=15 ANDROID_BUILD_TARGET_SDK_VERSION=23 ANDROID_BUILD_TOOLS_VERSION=23 ANDROID_BUILD_SDK_VERSION=23 diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java index de99fcd63..677bacf9f 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java @@ -209,7 +209,6 @@ public class MapView extends FrameLayout implements LocationListener { // // Common initialization code goes here - @TargetApi(16) private void initialize(Context context, AttributeSet attrs) { // Save the context @@ -236,12 +235,11 @@ public class MapView extends FrameLayout implements LocationListener { ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo(); ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); activityManager.getMemoryInfo(memoryInfo); + long maxMemory = memoryInfo.availMem; if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - long totalMemory = memoryInfo.totalMem; - mNativeMapView = new NativeMapView(this, cachePath, dataPath, apkPath, mScreenDensity, availableProcessors, totalMemory); - } else { - throw new RuntimeException("Need to implement totalMemory on pre-Jelly Bean devices."); + maxMemory = memoryInfo.totalMem; } + mNativeMapView = new NativeMapView(this, cachePath, dataPath, apkPath, mScreenDensity, availableProcessors, maxMemory); // Ensure this view is interactable setClickable(true); @@ -776,7 +774,6 @@ public class MapView extends FrameLayout implements LocationListener { } } - @TargetApi(9) private class Callbacks2 extends Callbacks implements SurfaceHolder.Callback2 { // Called when we need to redraw the view @@ -843,7 +840,7 @@ public class MapView extends FrameLayout implements LocationListener { } // Called when user touches the screen, all positions are absolute - @Override @TargetApi(14) + @Override public boolean onTouchEvent(@NonNull MotionEvent event) { // Check and ignore non touch or left clicks if ((android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) && (event.getButtonState() != 0) && (event.getButtonState() != MotionEvent.BUTTON_PRIMARY)) { @@ -1396,7 +1393,7 @@ public class MapView extends FrameLayout implements LocationListener { // Called when the mouse pointer enters or exits the view // or when it fades in or out due to movement - @Override @TargetApi(14) + @Override public boolean onHoverEvent(@NonNull MotionEvent event) { switch (event.getActionMasked()) { case MotionEvent.ACTION_HOVER_ENTER: diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle index 660720b00..b3e4164f2 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle +++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle @@ -47,7 +47,7 @@ android { defaultConfig { applicationId "com.mapbox.mapboxgl.testapp" - minSdkVersion 10 + minSdkVersion 15 targetSdkVersion 23 versionCode 4 versionName "0.1.3" From e91c21c284c03d73df7537834f6f8093ea729797 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Fri, 21 Aug 2015 15:51:26 -0500 Subject: [PATCH 3/5] #934 - Consolidating CallbackHandler due to API minimum being above Gingerbread --- .../main/java/com/mapbox/mapboxgl/views/MapView.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java index 677bacf9f..27f8dc2e9 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java @@ -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 From 11a1957770523d7b85a3e70bdf6b3e90ca9d2367 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Fri, 21 Aug 2015 16:14:07 -0500 Subject: [PATCH 4/5] #934 - Removing duplicate compass.png file and centralizing in common drawable --- .../src/main/res/drawable-xxhdpi/compass.png | Bin 2376 -> 0 bytes .../res/{drawable-mdpi => drawable}/compass.png | Bin 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/compass.png rename android/java/MapboxGLAndroidSDK/src/main/res/{drawable-mdpi => drawable}/compass.png (100%) diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/compass.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/compass.png deleted file mode 100644 index 58e7e08d2455e10b98d529d45ae3a9646956027c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2376 zcmV-O3Agr%P)F;&-Y`@6;yRCQSV~1a)066EUBX5c6tjiQ!3N0~mlMr1N@~m8VJc4LQ|J z;UFL}MJq|&zxmv5K*xduxEJ?}@>Q+@o4F5hkHO&qV4%ld^By~oW zAlQOU*yioXQeY;Mx;}xQ&`tBL42=JKy_pOuZmB8P z2{{1ys8V73`}<5ctw^Wrp#sC>cdYdtHed@jTk}J=6oVDfg$G5Z^GBO4CUe;Jd=_$ zV;9-qvCGbLuP~CBBvB`X=FGt5vX1B685%w$hpXs8F`0_u5(J->*l{C)+4kO-(F*~BwtAo;ads ztX(2Vyf1QZAKKM})oFcW!&y3UD#sx)$vLPM>_burCqtAj6i=oySpze$!v|~w;8WPj z>)n=w3(2{f5%d^hFbG-TB#nb-obymCDf~B-0fmT&;rTyG7nvo%#BIq^UY zT*s<~vqSp;m3u3M8`2nVkB3i5$>AiStk|J;#f!?7r>{%HElyp!cO!y=dm@t7gvfZ> z`L)JYqM$R4-|sECgL6;Xw>^Ph~UtA~?^I%(q&*#j2=g6PnOyYjAs zD9{l7eeRO7dN@J9s7_WY0v7>-h@7=72)bey*dOoA#hq78uTtGCFoKH!LEe8-WCftF z+W{8=f@lTX&Zu|#njD7%;vz_pVeK3f#OGjZCxjsW(M|DB1pJ<=HBGuf>}4m|g<_~r zPoF&xsG1Y>4*&rF|8_b0YybcRdPzhZCE_T)_k z4^l<9-#`ViFBaS4(Ss-y>=p|4U{89eXQ5cwp7c{zo}XtQmzN{I+Q49_Ua-w+&({XeNBn`0FJ4YX zeBxaE)Ucf0A{~79{sTKcK4v>Rza!$fj)lcVw+>QXR!r*b`e1m*Fzuhkblw@M91tMM z0F(xZSa2?WYFhU9vH%?(9hSuF$5#>O{y8vWSXIyHd6f^+fH ze$!qk1JIMnNyZ^PefB&AsjLwM7CsoBF-@mY79dP7OtXW7gV0nf3lLavE`DlR)<{`^ z&@YGaX>H9PMZ64Yk=nq*2NTFtXeIlVCd9NIHad1SvtYi8VT$oSvE*Y_yL0!RTb3uF zI%$S>-j_5b2E?Qi;Bu0sSZGDoaA`AH0#Cq#rC4XyiP!|OM0vd`=5?C9u-wOTFqxY1xvZ6Kk8a6~TJY&11J!9m$a9+7Lq zs9sYurZ$yiwvqs$4Ie$d7(p^k@I3+~uE4PEFH$2UK9758fY1lxqQU@?&v7hb%ld8m zb{-JUk`4GA3qw*^p;7cz$HBN2L8pD5b+xsSuf!of_K^VUGflHjqT4FMA52WROQ*K5 zoTh6~BQ#(cho)e8LcR@OWgHUAY18&5!LTcU!_g3=D!l7@I-1~PB7~Hi6c^c>GDtc? zWHx$LuBdI3{7;U1QUGD9T_Gp-L`QCokLwQQu1AE}x9T;A1g$Y`_TXEZ|4R31`~OJn zz^>Jpq~ka-nfGqN{&n_&&cHDrGkv2MD1GZo@*oSH!K9JLTOS%T7bKO9~4jM-# zX-@F>aB1~mtF^tIYEQJ|!8xblZ&y_-I@1l)3UNvD8BAyUq6!GMU{hzxdef?BBPT-A zdvHfqH}SuQqY|9Gh~;tDs({cIHeox?j!;IcRn8CO2n|Vr7XnD*BnZWsi)w_e0|+*w z=Q)v$^k!~LxrBjAan*~sm9{0qe>XG&bO0sUp?hsFLe3Ths(7zjhyGJ_-3_kjBtDqH zPb}BEri~}GsOm1dUd25sDd0RQ0*(6gjx36M5NDy=Ihn-qZTO5k;#j5~J#14SswaV2 z9O_})YUgbUy;4$m@0JSCwc#|qw-2Z18Iu#h3OP1H%Wi`nqWBhI)%~i({q!dIeG=uV u%=_YG6?M@DZAr)3m_j)L`)}r~6Zi+-n6!b6vRQlp0000 Date: Fri, 21 Aug 2015 16:14:59 -0500 Subject: [PATCH 5/5] #934 - Removing onLocationChanged() log statement --- .../src/main/java/com/mapbox/mapboxgl/views/MapView.java | 1 - 1 file changed, 1 deletion(-) diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java index 27f8dc2e9..f6723d786 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java @@ -1666,7 +1666,6 @@ public class MapView extends FrameLayout implements LocationListener { */ @Override public void onLocationChanged(Location location) { - Log.i(TAG, "onLocationChanged(): " + location); updateLocation(location); }