From 4b9c7f5837c2722e444e9312c48c43eed2a0097d Mon Sep 17 00:00:00 2001
From: Brad Leege <bleege@gmail.com>
Date: Thu, 10 Dec 2015 12:22:07 -0800
Subject: [PATCH] [android] #3244 -Camera activity for TestApp

---
 .../src/main/AndroidManifest.xml              |  4 +-
 .../mapboxsdk/testapp/CameraActivity.java     | 76 +++++++++++++++++++
 .../mapboxsdk/testapp/MainActivity.java       |  3 +
 .../src/main/res/layout/activity_camera.xml   | 33 ++++++++
 .../src/main/res/menu/menu_drawer.xml         |  4 +
 .../src/main/res/values/strings.xml           |  3 +
 6 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/CameraActivity.java
 create mode 100644 android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera.xml

diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index 44ebc8c9490..3188d717a1a 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -37,7 +37,9 @@
         <activity
             android:name=".BulkMarkerActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="@string/action_add_bulk_markers" />
+            android:label="@string/activity_add_bulk_markers" />
+        <activity android:name=".CameraActivity"
+                  android:label="@string/activity_camera"/>
         <activity
             android:name=".TiltActivity"
             android:label="@string/activity_tilt" />
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/CameraActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/CameraActivity.java
new file mode 100644
index 00000000000..d4c31735298
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/CameraActivity.java
@@ -0,0 +1,76 @@
+package com.mapbox.mapboxsdk.testapp;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import com.mapbox.mapboxsdk.constants.Style;
+import com.mapbox.mapboxsdk.utils.ApiAccess;
+import com.mapbox.mapboxsdk.views.MapView;
+
+public class CameraActivity extends AppCompatActivity {
+
+    private MapView mMapView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_camera);
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayShowHomeEnabled(true);
+        }
+
+        mMapView = (MapView) findViewById(R.id.mapView);
+        mMapView.setAccessToken(ApiAccess.getToken(this));
+        mMapView.setStyle(Style.MAPBOX_STREETS);
+        mMapView.onCreate(savedInstanceState);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        mMapView.onStart();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mMapView.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mMapView.onPause();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        mMapView.onStop();
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        mMapView.onSaveInstanceState(outState);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mMapView.onDestroy();
+    }
+
+    @Override
+    public void onLowMemory() {
+        super.onLowMemory();
+        mMapView.onLowMemory();
+    }
+}
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
index c303d94cdc1..44fc9f1756b 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
@@ -340,6 +340,9 @@ public boolean onNavigationItemSelected(MenuItem menuItem) {
                                 startActivity(new Intent(getApplicationContext(), InfoWindowAdapterActivity.class));
                                 return true;
 
+                            case R.id.camera:
+                                startActivity(new Intent(getApplicationContext(), CameraActivity.class));
+
                             case R.id.action_tilt:
                                 startActivity(new Intent(getApplicationContext(), TiltActivity.class));
                                 return true;
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera.xml
new file mode 100644
index 00000000000..446c0df4bc1
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/primary"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <com.mapbox.mapboxsdk.views.MapView
+        android:id="@+id/cameraMapView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/toolbar"/>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_gravity="end|bottom"
+        android:layout_margin="@dimen/fab_margin"
+        android:src="@drawable/ic_add_24dp"
+        app:backgroundTint="@android:color/white" />
+
+</RelativeLayout>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
index bfd70a936f5..1a3500ab3a2 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
@@ -72,6 +72,10 @@
                 android:icon="@drawable/ic_tilt"
                 android:title="@string/action_tilt" />
 
+            <item android:id="@+id/action_camera"
+                  android:checkable="false"
+                  android:title="@string/action_camera"/>
+
             <item
                 android:id="@+id/action_map_fragment"
                 android:checkable="false"
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
index 8cc299e39fc..392100047cc 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -14,6 +14,8 @@
     <string name="activity_info_window_concurrent">InfoWindow Activity (Concurrent)</string>
     <string name="activity_visible_coordinate_bounds">Visible Coordinate Bounds</string>
     <string name="activity_user_tracking_mode">User tracking mode</string>
+    <string name="activity_add_bulk_markers">Add Markers In Bulk</string>
+    <string name="activity_camera">Camera</string>
     <string name="activity_polyline">Polyline Activity</string>
     <string name="activity_animate_coordinate_change">Animate Coordinate Change</string>
 
@@ -34,6 +36,7 @@
     <string name="action_animate_coordinate_change">Animate Coordinate Change</string>
     <string name="action_info_window_concurrent">InfoWindow (Concurrent)</string>
     <string name="action_add_bulk_markers">Add Markers in bulk</string>
+    <string name="action_camera">Camera</string>
     <string name="action_visible_bounds">Set Visible Bounds</string>
     <string name="action_visible_bounds_explanation">Center map around 2 markers</string>
     <string name="action_remove_polylines">Remove polylines</string>