Update to Android support lib 22.2.1.
Remove duplicate multitouch classes.
This commit is contained in:
@@ -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
|
||||
//
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user