Commit Graph

60 Commits

Author SHA1 Message Date
Leith Bade
314eba0002 api 16 compat 2014-11-15 20:08:34 +11:00
Leith Bade
2404f6ca0e Android api 17 compat 2014-11-15 19:49:13 +11:00
Leith Bade
6f78ec8a70 Give Travis latest build tools 2014-11-15 19:37:41 +11:00
Leith Bade
6ffb4951df Update to new build tools 2014-11-15 18:57:38 +11:00
Leith Bade
7f2d876fc4 Fix some lint errors 2014-11-15 11:29:11 +11:00
Leith Bade
7d66632209 Change to proper Log functions 2014-11-15 11:14:37 +11:00
Justin R. Miller
dce0f0b6d9 Revert "Fix Makefile"
This reverts commit 990be6743f.
2014-11-13 18:15:29 -08:00
Leith Bade
990be6743f Fix Makefile 2014-11-14 08:07:56 +11:00
Leith Bade
0c2e3be5af Implement connectivity monitoring
Enable map debug mode in debug builds
Go back to MainActivity
2014-11-14 01:15:09 +11:00
Leith Bade
ce2ffef38a Scale map style to match screen DPI 2014-11-13 06:57:14 +11:00
Justin R. Miller
4383385139 add default, unburned icons to satisfy Studio 2014-11-12 10:22:45 -08:00
Justin R. Miller
f8063e840e Merge branch 'android-mason' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
2014-11-12 09:45:46 -08:00
Leith Bade
7877d0505e Fix crash 2014-11-12 23:17:07 +11:00
Leith Bade
82908c99f7 More tidy up 2014-11-12 22:03:27 +11:00
Leith Bade
49da2c2fa5 Tidy code up more 2014-11-12 22:00:44 +11:00
Leith Bade
6b9e3c60ef Renamed source files using mapbox style
Move headers to mbgl/android
Tidy up headers and includes
2014-11-12 21:17:24 +11:00
Justin R. Miller
0f4bd9a332 add dev icon burning 2014-11-11 16:21:07 -08:00
Justin R. Miller
918f590d9b rename icons 2014-11-11 16:11:42 -08:00
Leith Bade
a1274fbc80 Lets no get ahead of ourselves 2014-11-12 08:13:06 +11:00
Justin R. Miller
dfd382c3e8 update app icons 2014-11-11 10:48:38 -08:00
Justin R. Miller
53016d65d4 use remote style URL 2014-11-11 10:48:30 -08:00
Leith Bade
beb12bada2 Missed other Map::terminate() call 2014-11-11 23:05:30 +11:00
Leith Bade
de1f37fa9e Change Assetbridge extraction dir to data dir
Only extract needed files
2014-11-11 22:50:37 +11:00
Leith Bade
e8139cbcfd Fix function name 2014-11-11 22:35:46 +11:00
Leith Bade
682e9404c4 We no longer need to call Map::terminate9 2014-11-11 22:32:43 +11:00
Leith Bade
6ee24f07d7 Be sure to terminate everything 2014-11-11 22:31:25 +11:00
Leith Bade
6b65aa62a1 Fix flixker after switch 2014-11-10 00:23:09 +11:00
Leith Bade
b6616f0aa3 Remove old comments 2014-11-10 00:04:20 +11:00
Leith Bade
1e55c332cd Wait for pause
Tidy up
Remove red fill
2014-11-09 23:52:34 +11:00
Leith Bade
3696e05193 Add async asserts 2014-11-09 22:54:05 +11:00
Leith Bade
28d66bb6f8 Add Map::pause/resume
Fixed bug after switching apps
2014-11-09 22:36:37 +11:00
Leith Bade
9cb874c0f2 Reduce log noise 2014-11-09 17:19:11 +11:00
Leith Bade
4854527e31 Work around emulator GL ES 2.0 bug 2014-11-09 16:40:39 +11:00
Leith Bade
54d176fed0 Implement GL extensions 2014-11-09 01:22:38 +11:00
Leith Bade
70057e1b8e Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into android-mason
Conflicts:
	gyp/common.gypi
	include/mbgl/geometry/vao.hpp
	include/mbgl/platform/event.hpp
	include/mbgl/platform/gl.hpp
	platform/default/http_request_baton_curl.cpp
	src/storage/response.cpp
2014-11-09 00:35:52 +11:00
Leith Bade
30a420d9a3 More tidying up 2014-11-08 22:59:16 +11:00
Leith Bade
3f4623b8b7 Enable debug layer
Less verbose logcat spew
Fix problem with checking for depth buffer size
Disable make_inactive for testing
2014-11-08 21:41:57 +11:00
Leith Bade
78059715ac Tidy up config choosing 2014-11-08 19:04:26 +11:00
Leith Bade
5b6c7aa870 Stop file not found error in Makefile
Update JNI methods
Tiny up Java
2014-11-08 16:23:43 +11:00
Leith Bade
c0bcd1e260 Add cache path variable from Java
Use cache path for db location
Add Assetbridge to extract asset files to cache path
Fix SSL by using extracted ca bundle
Use file:// style URL using extracted styles
2014-11-08 12:49:46 +11:00
Leith Bade
9e81ab5228 Merge branch 'android-mason' of https://github.com/mapbox/mapbox-gl-native into android-mason 2014-11-08 11:58:00 +11:00
Leith Bade
7de5c03cfb Move style url and spi key to java
Try 565 config then 8888
Remove unused perm
2014-11-08 11:56:30 +11:00
Justin R. Miller
ee482fbf6e fix styles path 2014-11-07 16:28:19 -08:00
Justin R. Miller
8f4a6452e6 require GL ES 2 (even if ignored by emulator) 2014-11-07 16:28:11 -08:00
Leith Bade
0ac4247f72 Temp disable SSL cert validation 2014-11-08 08:44:39 +11:00
Leith Bade
a86fff1ab7 Rename old log functions 2014-11-08 01:05:49 +11:00
Leith Bade
ee11f36093 Non https style URL 2014-11-07 23:59:45 +11:00
Leith Bade
7477d0c9df Finish android log backend 2014-11-07 23:46:28 +11:00
Leith Bade
4a35b831fc Better way to avoid warnings 2014-11-07 21:04:59 +11:00
Leith Bade
5ad9e14926 Enable debug rendering, work around make_inactive bug 2014-11-07 01:22:28 +11:00