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

Update to Android support lib 22.2.1.

Browse Source 
Remove duplicate multitouch classes.
This commit is contained in:
Leith Bade
2015-07-28 12:18:31 +10:00
parent 0178c94f6d
commit 60a21de907
10 changed files with 8 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/java/MapboxGLAndroidSDKTestApp/build.gradle
View File

@@ -83,8 +83,8 @@ dependencies {
transitive = true
}
compile 'com.android.support:support-annotations:22.1.1'
compile 'com.android.support:support-v4:22.1.1'
compile 'com.android.support:appcompat-v7:22.1.1'
compile 'com.android.support:support-v4:22.2.1'
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.mapzen.android:lost:1.0.0'
compile('com.crashlytics.sdk.android:crashlytics:2.4.0@aar') {
transitive = true;

2
android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
View File

@@ -60,7 +60,6 @@ public class MainActivity extends ActionBarActivity {
//
// Used for the UI
// private MapFragment mMapFragment;
private MapView mapView;
private TextView mFpsTextView;
private ImageView mCompassView;
@@ -227,7 +226,6 @@ public class MainActivity extends ActionBarActivity {
outState.putBoolean(STATE_IS_GPS_ON, mIsGpsOn);
}
//
// Other events
//

18
android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MapFragment.java
View File

@@ -7,13 +7,8 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.mapbox.mapboxgl.geometry.LatLng;
import com.mapbox.mapboxgl.views.MapView;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
public class MapFragment extends Fragment {
//
@@ -43,17 +38,6 @@ public class MapFragment extends Fragment {
// Create the map
mMap = (MapView) inflater.inflate(R.layout.fragment_main, container, true);
// Load the access token
/*
try {
BufferedReader reader = new BufferedReader(new InputStreamReader(getActivity().getApplicationContext().getResources().openRawResource(R.raw.token)));
String line = reader.readLine();
mMap.setAccessToken(line);
} catch (IOException e) {
return null;
}
*/
// Need to pass on any saved state to the map
mMap.onCreate(savedInstanceState);
@@ -80,8 +64,6 @@ public class MapFragment extends Fragment {
// Need to pass on to view
mMap.onStart();
mMap.setCenterCoordinate(new LatLng(38.247887,-121.843872));
mMap.setZoomLevel(7);
}
// Called when the fragment is invisible