From d975d94de237a05ff8b9ddce55a85b5a66481f5e Mon Sep 17 00:00:00 2001
From: Brad Leege <bleege@gmail.com>
Date: Fri, 24 Jul 2015 14:36:57 -0500
Subject: [PATCH] #1929 - accessToken added as XML attribute option.  Removed
 call to raw.txt for access token from MapFragment to test.

---
 .../com/mapbox/mapboxgl/views/MapView.java    |  3 ++
 .../src/main/res/values/attrs.xml             | 29 +++++++------------
 .../mapbox/mapboxgl/testapp/MapFragment.java  |  2 ++
 .../src/main/res/layout/fragment_main.xml     |  6 ++--
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
index 0db14364e..87794d864 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
@@ -174,6 +174,9 @@ public class MapView extends SurfaceView {
             if (typedArray.getString(R.styleable.MapView_styleUrl) != null) {
                 setStyleUrl(typedArray.getString(R.styleable.MapView_styleUrl));
             }
+            if (typedArray.getString(R.styleable.MapView_accessToken) != null) {
+                setAccessToken(typedArray.getString(R.styleable.MapView_accessToken));
+            }
         } finally {
             typedArray.recycle();
         }
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/android/java/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
index 770b70317..1e168456b 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
@@ -1,23 +1,14 @@
 <resources>
-    <attr name="centerLongitude" format="float" />
-    <attr name="centerLatitude" format="float" />
-    <attr name="zoomLevel" format="float" />
-    <attr name="direction" format="float" />
-    <attr name="zoomEnabled" format="boolean" />
-    <attr name="scrollEnabled" format="boolean" />
-    <attr name="rotateEnabled" format="boolean" />
-    <attr name="debugActive" format="boolean" />
-    <attr name="styleUrl" format="string" />
-    
     <declare-styleable name="MapView">
-        <attr name="centerLongitude" />
-        <attr name="centerLatitude" />
-        <attr name="zoomLevel" />
-        <attr name="direction" />
-        <attr name="zoomEnabled" />
-        <attr name="scrollEnabled" />
-        <attr name="rotateEnabled" />
-        <attr name="debugActive" />
-        <attr name="styleUrl" />
+        <attr name="centerLongitude" format="float" />
+        <attr name="centerLatitude" format="float" />
+        <attr name="zoomLevel" format="float" />
+        <attr name="direction" format="float" />
+        <attr name="zoomEnabled" format="boolean" />
+        <attr name="scrollEnabled" format="boolean" />
+        <attr name="rotateEnabled" format="boolean" />
+        <attr name="debugActive" format="boolean" />
+        <attr name="styleUrl" format="string" />
+        <attr name="accessToken" format="string"/>
     </declare-styleable>
 </resources>
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MapFragment.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MapFragment.java
index d3a6d2ad1..5b2408355 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MapFragment.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MapFragment.java
@@ -44,6 +44,7 @@ public class MapFragment extends Fragment {
         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();
@@ -51,6 +52,7 @@ public class MapFragment extends Fragment {
         } catch (IOException e) {
             return null;
         }
+*/
 
         // Need to pass on any saved state to the map
         mMap.onCreate(savedInstanceState);
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml
index f303a02f5..642a5e7d3 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.mapbox.mapboxgl.views.MapView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+                                   xmlns:mapbox="http://schemas.android.com/apk/res-auto"
+                                   android:layout_width="match_parent"
+                                   android:layout_height="match_parent"
+                                   />