Merge remote-tracking branch 'mapbox/master' into 2317-espresso

Conflicts:
	src/mbgl/util/geojsonvt

android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml

@@ -17,6 +17,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".SecondMapActivity" android:label="@string/activity_second"/>
         <meta-data
             android:name="io.fabric.ApiKey"
             android:value="9724157045ff7d083492c6d9ae03e60e8609d461" />

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

@@ -1,6 +1,7 @@
 package com.mapbox.mapboxgl.testapp;
 
 import android.Manifest;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.graphics.PointF;
@@ -281,6 +282,10 @@ public class MainActivity extends AppCompatActivity {
                                 menuItem.setChecked(mMapView.isCompassEnabled());
                                 return true;
 
+                            case R.id.action_second_map_activity:
+                                startActivity(new Intent(getApplicationContext(), SecondMapActivity.class));
+                                return true;
+
 /*
                             case R.id.followNone:
                                 mMapView.setUserLocationTrackingMode(MapView.UserLocationTrackingMode.NONE);

android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/SecondMapActivity.java

@@ -0,0 +1,101 @@
+package com.mapbox.mapboxgl.testapp;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.MenuItem;
+import com.mapbox.mapboxgl.views.MapView;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+public class SecondMapActivity extends AppCompatActivity {
+
+    private static final String TAG = "SecondMapActivity";
+
+    private MapView mMapView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_second);
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.secondToolBar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayShowHomeEnabled(true);
+
+        mMapView = (MapView) findViewById(R.id.secondMapView);
+        // Load the access token
+        try {
+            BufferedReader reader = new BufferedReader(new InputStreamReader(getResources().openRawResource(R.raw.token)));
+            String line = reader.readLine();
+            mMapView.setAccessToken(line);
+        } catch (IOException e) {
+            Log.e(TAG, "Error loading access token from token.txt: " + e.toString());
+        }
+
+        mMapView.onCreate(savedInstanceState);
+
+        mMapView.setStyleUrl(getString(R.string.styleURLEmerald));
+    }
+
+    /**
+     * Dispatch onStart() to all fragments.  Ensure any created loaders are
+     * now started.
+     */
+    @Override
+    protected void onStart() {
+        super.onStart();
+        mMapView.onStart();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        mMapView.onStop();
+    }
+
+    // Called when our app goes into the background
+    @Override
+    public void onPause()  {
+        super.onPause();
+
+        mMapView.onPause();
+    }
+
+    // Called when our app comes into the foreground
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        mMapView.onResume();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mMapView.onDestroy();
+    }
+
+    // Called when the system is running low on memory
+    @Override
+    public void onLowMemory() {
+        super.onLowMemory();
+
+        mMapView.onLowMemory();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+}

android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_second.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/secondToolBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/primary"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+
+    <com.mapbox.mapboxgl.views.MapView
+        android:id="@+id/secondMapView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
+
+</LinearLayout>

android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml

@@ -19,18 +19,24 @@
           android:checkable="true"
           />
 
-<!--
-    <group android:id="@+id/locationFollowModesSeparator"/>
+    <item android:id="@+id/action_second_map_activity"
+          android:icon="@drawable/ic_looks_two_white_24dp"
+          android:title="@string/action_second_map_activity"
+          android:checkable="false"
+        />
 
-    <group android:id="@+id/locationFollowModes" android:checkableBehavior="single">
-        <item android:id="@+id/followNone"
-              android:title="@string/action_location_none"/>
-        <item android:id="@+id/followFollow"
-              android:title="@string/action_location_follow"/>
-        <item android:id="@+id/followBearing"
-              android:title="@string/action_location_bearing"/>
-    </group>
--->
+    <!--
+        <group android:id="@+id/locationFollowModesSeparator"/>
+
+        <group android:id="@+id/locationFollowModes" android:checkableBehavior="single">
+            <item android:id="@+id/followNone"
+                  android:title="@string/action_location_none"/>
+            <item android:id="@+id/followFollow"
+                  android:title="@string/action_location_follow"/>
+            <item android:id="@+id/followBearing"
+                  android:title="@string/action_location_bearing"/>
+        </group>
+    -->
 
     <group android:id="@+id/stylesSeparator"/>
 

android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml

@@ -3,6 +3,8 @@
 
     <string name="app_name">Mapbox GL</string>
 
+    <string name="activity_second">Second Activity</string>
+
     <string name="action_gps">Toggle GPS location</string>
     <string name="action_location_none">Disable tracking</string>
     <string name="action_location_follow">Use follow tracking mode</string>
@@ -10,6 +12,7 @@
     <string name="action_compass">Toggle compass</string>
     <string name="action_debug">Toggle debug mode</string>
     <string name="action_point_annotations">Toggle point annotations</string>
+    <string name="action_second_map_activity">Launch 2nd Map</string>
 
     <string name="label_fps">FPS:</string>