diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-02-06 16:13:25 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-02-17 11:42:47 -0800 |
| commit | b29bce0936ac711b7fa6c2a43684696021dfb668 (patch) | |
| tree | 8515a6923421df3ef7c5b2dd660c9d11f1016b65 /android | |
| parent | fe0baffe0dfbf369f422e175c0fcf3dda9055118 (diff) | |
| download | qtlocation-mapboxgl-b29bce0936ac711b7fa6c2a43684696021dfb668.tar.gz | |
add ca bundle loading back to CURL
Diffstat (limited to 'android')
| -rw-r--r-- | android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java index e8b1d578b7..a10c0206be 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java @@ -214,7 +214,7 @@ public class MainActivity extends ActionBarActivity { switch(position) { // Bright case 0: - mMapFragment.getMap().setStyleUrl("asset://styles/styles/bright-v7.json"); + mMapFragment.getMap().setStyleUrl("asset://styles/bright-v7.json"); mMapFragment.getMap().removeAllClasses(); mClassSpinner.setVisibility(View.INVISIBLE); mClassSpinner.setAdapter(null); @@ -223,7 +223,7 @@ public class MainActivity extends ActionBarActivity { // Basic case 1: - mMapFragment.getMap().setStyleUrl("asset://styles/styles/basic-v7.json"); + mMapFragment.getMap().setStyleUrl("asset://styles/basic-v7.json"); mMapFragment.getMap().removeAllClasses(); mClassSpinner.setVisibility(View.INVISIBLE); mClassSpinner.setAdapter(null); @@ -232,7 +232,7 @@ public class MainActivity extends ActionBarActivity { // Outdoors case 2: - mMapFragment.getMap().setStyleUrl("asset://styles/styles/outdoors-v7.json"); + mMapFragment.getMap().setStyleUrl("asset://styles/outdoors-v7.json"); mMapFragment.getMap().removeAllClasses(); mClassSpinner.setVisibility(View.VISIBLE); mClassSpinner.setAdapter(mOutdoorsClassAdapter); @@ -241,7 +241,7 @@ public class MainActivity extends ActionBarActivity { // Satellite case 3: - mMapFragment.getMap().setStyleUrl("asset://styles/styles/satellite-v7.json"); + mMapFragment.getMap().setStyleUrl("asset://styles/satellite-v7.json"); mMapFragment.getMap().removeAllClasses(); mClassSpinner.setVisibility(View.VISIBLE); mClassSpinner.setAdapter(mSatelliteClassAdapter); @@ -250,7 +250,7 @@ public class MainActivity extends ActionBarActivity { // Pencil case 4: - mMapFragment.getMap().setStyleUrl("asset://styles/styles/pencil-v7.json"); + mMapFragment.getMap().setStyleUrl("asset://styles/pencil-v7.json"); mMapFragment.getMap().removeAllClasses(); mClassSpinner.setVisibility(View.INVISIBLE); mClassSpinner.setAdapter(null); @@ -259,7 +259,7 @@ public class MainActivity extends ActionBarActivity { // Empty case 5: - mMapFragment.getMap().setStyleUrl("asset://styles/styles/empty-v7.json"); + mMapFragment.getMap().setStyleUrl("asset://styles/empty-v7.json"); mMapFragment.getMap().removeAllClasses(); mClassSpinner.setVisibility(View.INVISIBLE); mClassSpinner.setAdapter(null); |