From ba97c6984536d6ac9461147eebfc8dcacfbffe6e Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun.van.nuland@gmail.com>
Date: Thu, 8 Oct 2015 10:08:58 +0200
Subject: [PATCH] [android] #2462 moving MapFragment into the SDK

---
 .../java/com/mapbox/mapboxsdk}/MapFragment.java   | 15 ++++++++++++---
 .../src/main/res/layout/fragment_main.xml         |  0
 .../mapboxsdk/testapp/MapFragmentActivity.java    |  1 +
 3 files changed, 13 insertions(+), 3 deletions(-)
 rename android/java/{MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp => MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk}/MapFragment.java (88%)
 rename android/java/{MapboxGLAndroidSDKTestApp => MapboxGLAndroidSDK}/src/main/res/layout/fragment_main.xml (100%)

diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragment.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapFragment.java
similarity index 88%
rename from android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragment.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapFragment.java
index 1dc464536..ae69e72bf 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragment.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapFragment.java
@@ -1,4 +1,4 @@
-package com.mapbox.mapboxsdk.testapp;
+package com.mapbox.mapboxsdk;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -7,9 +7,9 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.mapbox.mapboxsdk.utils.ApiAccess;
 import com.mapbox.mapboxsdk.views.MapView;
 
-// TODO move this to SDK
 public class MapFragment extends Fragment {
 
     //
@@ -40,7 +40,7 @@ public class MapFragment extends Fragment {
         mMap = (MapView) inflater.inflate(R.layout.fragment_main, container, false);
 
         // Set accessToken
-        mMap.setAccessToken(Util.getAccessToken(container.getContext()));
+        mMap.setAccessToken(ApiAccess.getToken(container.getContext()));
 
         // Need to pass on any saved state to the map
         mMap.onCreate(savedInstanceState);
@@ -110,6 +110,15 @@ public class MapFragment extends Fragment {
         super.onSaveInstanceState(outState);
     }
 
+    @Override
+    public void onLowMemory() {
+        Log.v(TAG, "OnLowMemory");
+
+        // Need to pass on to view
+        mMap.onLowMemory();
+        super.onLowMemory();
+    }
+
     //
     // Property methods
     //
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml b/android/java/MapboxGLAndroidSDK/src/main/res/layout/fragment_main.xml
similarity index 100%
rename from android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml
rename to android/java/MapboxGLAndroidSDK/src/main/res/layout/fragment_main.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java
index acff5671d..ebb1e2f11 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java
@@ -9,6 +9,7 @@ import android.view.Gravity;
 import android.view.MenuItem;
 import android.view.View;
 
+import com.mapbox.mapboxsdk.MapFragment;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.views.MapView;