From 0d899df9ddc9a7a9a8bfbac2c4b077ce26da64e9 Mon Sep 17 00:00:00 2001
From: "Justin R. Miller" <incanus@codesorcery.net>
Date: Tue, 8 Sep 2015 18:03:10 -0700
Subject: [PATCH 1/9] fixes #1675: abstract annotation tile refresh
 check/render; trigger post-sprite/sprite store load

---
 src/mbgl/map/annotation.hpp     |  1 +
 src/mbgl/map/map_context.cpp    | 10 ++++++++--
 src/mbgl/map/map_context.hpp    |  2 ++
 src/mbgl/style/style.cpp        |  4 ++++
 src/mbgl/style/style.hpp        |  1 +
 test/style/resource_loading.cpp |  4 ++++
 6 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/mbgl/map/annotation.hpp b/src/mbgl/map/annotation.hpp
index 745fc779c..5adec162f 100644
--- a/src/mbgl/map/annotation.hpp
+++ b/src/mbgl/map/annotation.hpp
@@ -52,6 +52,7 @@ public:
     ~AnnotationManager();
 
     void markStaleTiles(std::unordered_set<TileID, TileID::Hash>);
+    size_t getStaleTileCount() const { return staleTiles.size(); }
     std::unordered_set<TileID, TileID::Hash> resetStaleTiles();
 
     void setDefaultPointAnnotationSymbol(const std::string& symbol);
diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp
index 94aedb46d..0ebcd73f8 100644
--- a/src/mbgl/map/map_context.cpp
+++ b/src/mbgl/map/map_context.cpp
@@ -142,9 +142,11 @@ void MapContext::loadStyleJSON(const std::string& json, const std::string& base)
 
     updateFlags |= Update::DefaultTransition | Update::Classes | Update::Zoom;
     asyncUpdate->send();
+}
 
-    auto staleTiles = data.getAnnotationManager()->resetStaleTiles();
-    if (!staleTiles.empty()) {
+void MapContext::updateAnnotationTilesIfNeeded() {
+    if (data.getAnnotationManager()->getStaleTileCount()) {
+        auto staleTiles = data.getAnnotationManager()->resetStaleTiles();
         updateAnnotationTiles(staleTiles);
     }
 }
@@ -417,4 +419,8 @@ void MapContext::onResourceLoadingFailed(std::exception_ptr error) {
     }
 }
 
+void MapContext::onSpriteStoreLoaded() {
+    updateAnnotationTilesIfNeeded();
+}
+
 }
diff --git a/src/mbgl/map/map_context.hpp b/src/mbgl/map/map_context.hpp
index f1bfb01e4..449a0f1d1 100644
--- a/src/mbgl/map/map_context.hpp
+++ b/src/mbgl/map/map_context.hpp
@@ -54,6 +54,7 @@ public:
     bool isLoaded() const;
 
     double getTopOffsetPixelsForAnnotationSymbol(const std::string& symbol);
+    void updateAnnotationTilesIfNeeded();
     void updateAnnotationTiles(const std::unordered_set<TileID, TileID::Hash>&);
 
     void setSourceTileCacheSize(size_t size);
@@ -66,6 +67,7 @@ public:
     // Style::Observer implementation.
     void onTileDataChanged() override;
     void onResourceLoadingFailed(std::exception_ptr error) override;
+    void onSpriteStoreLoaded() override;
 
 private:
     // Update the state indicated by the accumulated Update flags, then render.
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 768621530..d4c9bd4e5 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -190,6 +190,10 @@ void Style::onSpriteLoaded(const Sprites& sprites) {
     // Add all sprite images to the SpriteStore object
     spriteStore->setSprites(sprites);
 
+    if (observer) {
+        observer->onSpriteStoreLoaded();
+    }
+
     shouldReparsePartialTiles = true;
     emitTileDataChanged();
 }
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index cbc0ee2db..3f9696ffb 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -39,6 +39,7 @@ public:
         virtual ~Observer() = default;
 
         virtual void onTileDataChanged() = 0;
+        virtual void onSpriteStoreLoaded() = 0;
         virtual void onResourceLoadingFailed(std::exception_ptr error) = 0;
     };
 
diff --git a/test/style/resource_loading.cpp b/test/style/resource_loading.cpp
index 056243458..5ed09065a 100644
--- a/test/style/resource_loading.cpp
+++ b/test/style/resource_loading.cpp
@@ -63,6 +63,10 @@ public:
         callback_(error);
     }
 
+    void onSpriteStoreLoaded() override {
+        // no-op
+    }
+
 private:
     MapData data_;
     Transform transform_;

From ea0992b72f3d70eb474a8c120e776032bfc57d01 Mon Sep 17 00:00:00 2001
From: tobrunvannuland <tobrun.van.nuland@gmail.com>
Date: Tue, 1 Sep 2015 08:36:53 +0200
Subject: [PATCH 2/9] Added info icon and map box logo

---
 .../com/mapbox/mapboxgl/views/MapView.java    | 133 +++++++++++++++++-
 .../main/res/color/material_bg_selector.xml   |   8 ++
 .../ic_info_outline_black_24dp.png            | Bin 0 -> 487 bytes
 .../ic_info_outline_black_24dp.png            | Bin 0 -> 323 bytes
 .../ic_info_outline_black_24dp.png            | Bin 0 -> 640 bytes
 .../ic_info_outline_black_24dp.png            | Bin 0 -> 940 bytes
 .../res/drawable-xxhdpi/ic_logo_mapbox.png    | Bin 0 -> 7059 bytes
 .../ic_info_outline_black_24dp.png            | Bin 0 -> 1256 bytes
 .../src/main/res/values/arrays.xml            |  13 ++
 .../src/main/res/values/attrs.xml             |  62 +++++++-
 .../src/main/res/values/strings.xml           |   3 +
 11 files changed, 215 insertions(+), 4 deletions(-)
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_outline_black_24dp.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_outline_black_24dp.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_outline_black_24dp.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_outline_black_24dp.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_logo_mapbox.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_outline_black_24dp.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/values/arrays.xml

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 0c3429e00..7bb9f4327 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
@@ -1,16 +1,22 @@
 package com.mapbox.mapboxgl.views;
 
 import android.app.ActivityManager;
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
+import android.content.res.XmlResourceParser;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
 import android.graphics.PointF;
 import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
 import android.hardware.GeomagneticField;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
@@ -19,10 +25,12 @@ import android.hardware.SensorManager;
 import android.location.Location;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v4.view.GestureDetectorCompat;
 import android.support.v4.view.ScaleGestureDetectorCompat;
 import android.text.TextUtils;
@@ -37,6 +45,8 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ZoomButtonsController;
@@ -94,6 +104,10 @@ public class MapView extends FrameLayout implements LocationListener {
     private static final String STATE_MY_LOCATION_ENABLED = "myLocationEnabled";
     private static final String STATE_USER_LOCATION_TRACKING_MODE = "userLocationTrackingMode";
 
+    // Used for positioning views
+    private static final float DIMENSION_SIXTEEN_DP = 16f;
+    private static final float DIMENSION_TEN_DP = 10f;
+
     /**
      * Every annotation that has been added to the map.
      */
@@ -155,6 +169,12 @@ public class MapView extends FrameLayout implements LocationListener {
     private float mCompassBearing;
     private boolean mCompassValid = false;
 
+    // Used for MapboxLogo
+    private ImageView mLogoView;
+
+    // Used for attributions control
+    private ImageView mAttributionsView;
+
     // Used for map toggle mode
     private long t0 = new Date().getTime();
 
@@ -305,6 +325,8 @@ public class MapView extends FrameLayout implements LocationListener {
 
         // Get the screen's density
         mScreenDensity = context.getResources().getDisplayMetrics().density;
+        int tenDp = (int)(10 * mScreenDensity);
+        int sixteenDp = (int)(16 * mScreenDensity);
 
         // Get the cache path
         String cachePath = context.getCacheDir().getAbsolutePath();
@@ -372,13 +394,30 @@ public class MapView extends FrameLayout implements LocationListener {
         mCompassView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.compass));
         mCompassView.setContentDescription(getResources().getString(R.string.compassContentDescription));
         LayoutParams lp = new FrameLayout.LayoutParams((int)(48 * mScreenDensity), (int)(48 * mScreenDensity));
-        lp.gravity = Gravity.TOP | Gravity.END;
-        int tenDp = (int)(10 * mScreenDensity);
-        lp.setMargins(tenDp, tenDp, tenDp, tenDp);
         mCompassView.setLayoutParams(lp);
         addView(mCompassView);
         mCompassView.setOnClickListener(new CompassOnClickListener());
 
+        // Setup Mapbox logo
+        mLogoView = new ImageView(mContext);
+        mLogoView.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_logo_mapbox));
+        mLogoView.setContentDescription(getResources().getString(R.string.mapboxIconContentDescription));
+        LayoutParams logoParams = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        mLogoView.setLayoutParams(logoParams);
+        addView(mLogoView);
+
+        // Setup Attributions control
+        mAttributionsView = new ImageView(mContext);
+        Drawable attrDrawable = ContextCompat.getDrawable(mContext, R.drawable.ic_info_outline_black_24dp);
+        attrDrawable = DrawableCompat.wrap(attrDrawable);
+        DrawableCompat.setTintList(attrDrawable, getResources().getColorStateList(R.color.material_bg_selector, mContext.getTheme()));
+        mAttributionsView.setImageDrawable(attrDrawable);
+        mAttributionsView.setContentDescription(getResources().getString(R.string.attributionsIconContentDescription));
+        LayoutParams attrParams = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        mAttributionsView.setLayoutParams(attrParams);
+        addView(mAttributionsView);
+        mAttributionsView.setOnClickListener(new AttributionOnClickListener());
+
         // Setup Support For Listener Tracking
         // MapView's internal listener is setup in onCreate()
         mOnMapChangedListener = new ArrayList<>();
@@ -411,7 +450,29 @@ public class MapView extends FrameLayout implements LocationListener {
                 }
                 setStyleClasses(styleClasses);
             }
+
+            // Compass
             setCompassEnabled(typedArray.getBoolean(R.styleable.MapView_compassEnabled, true));
+            setCompassGravity(typedArray.getInt(R.styleable.MapView_compassGravity, Gravity.TOP | Gravity.END));
+            setWidgetMargins(mCompassView, typedArray.getDimension(R.styleable.MapView_compassMarginLeft, DIMENSION_TEN_DP)
+                    , typedArray.getDimension(R.styleable.MapView_compassMarginTop, DIMENSION_TEN_DP)
+                    , typedArray.getDimension(R.styleable.MapView_compassMarginRight, DIMENSION_TEN_DP)
+                    , typedArray.getDimension(R.styleable.MapView_compassMarginBottom, DIMENSION_TEN_DP));
+
+            // Logo
+            setLogoGravity(typedArray.getInt(R.styleable.MapView_logoGravity, Gravity.BOTTOM | Gravity.START));
+            setWidgetMargins(mLogoView, typedArray.getDimension(R.styleable.MapView_logoMarginLeft, DIMENSION_SIXTEEN_DP)
+                    , typedArray.getDimension(R.styleable.MapView_logoMarginTop, DIMENSION_SIXTEEN_DP)
+                    , typedArray.getDimension(R.styleable.MapView_logoMarginRight, DIMENSION_SIXTEEN_DP)
+                    , typedArray.getDimension(R.styleable.MapView_logoMarginBottom, DIMENSION_SIXTEEN_DP));
+
+            // Attribution
+            setAttributionGravity(typedArray.getInt(R.styleable.MapView_attributionGravity, Gravity.BOTTOM | Gravity.END));
+            setWidgetMargins(mAttributionsView, typedArray.getDimension(R.styleable.MapView_attributionMarginLeft, DIMENSION_SIXTEEN_DP)
+                    , typedArray.getDimension(R.styleable.MapView_attributionMarginTop, DIMENSION_SIXTEEN_DP)
+                    , typedArray.getDimension(R.styleable.MapView_attributionMarginRight, DIMENSION_SIXTEEN_DP)
+                    , typedArray.getDimension(R.styleable.MapView_attributionMarginBottom, DIMENSION_SIXTEEN_DP));
+
             setMyLocationEnabled(typedArray.getBoolean(R.styleable.MapView_myLocationEnabled, false));
         } finally {
             typedArray.recycle();
@@ -1827,6 +1888,48 @@ public class MapView extends FrameLayout implements LocationListener {
         updateMap(MapChange.MapChangeNullChange);
     }
 
+    public void setCompassGravity(int gravity){
+        setWidgetGravity(mCompassView, gravity);
+    }
+
+    public void setCompassMargins(int left, int top, int right, int bottom){
+        setWidgetMargins(mCompassView, left, top, right, bottom);
+    }
+
+    public void setLogoGravity(int gravity){
+        setWidgetGravity(mLogoView, gravity);
+    }
+
+    public void setLogoMargins(int left, int top, int right, int bottom){
+        setWidgetMargins(mLogoView, left, top, right, bottom);
+    }
+
+    public void setAttributionGravity(int gravity){
+        setWidgetGravity(mAttributionsView, gravity);
+    }
+
+    public void setAttributionMargins(int left, int top, int right, int bottom) {
+        setWidgetMargins(mAttributionsView, left, top, right, bottom);
+    }
+
+    private void setWidgetGravity(@NonNull final View view, int gravity){
+        LayoutParams layoutParams = (LayoutParams) view.getLayoutParams();
+        layoutParams.gravity = gravity;
+        view.setLayoutParams(layoutParams);
+    }
+
+    private void setWidgetMargins(@NonNull final View view, int left, int top, int right, int bottom){
+        LayoutParams layoutParams = (LayoutParams) view.getLayoutParams();
+        layoutParams.setMargins(left,top,right,bottom);
+        view.setLayoutParams(layoutParams);
+    }
+
+    private void setWidgetMargins(@NonNull final View view, float leftDp, float topDp, float rightDp, float bottomDp){
+        LayoutParams layoutParams = (LayoutParams) view.getLayoutParams();
+        layoutParams.setMargins((int)(leftDp*mScreenDensity),(int)(topDp*mScreenDensity),(int)(rightDp*mScreenDensity),(int)(bottomDp*mScreenDensity));
+        view.setLayoutParams(layoutParams);
+    }
+
     // This class handles sensor updates to calculate compass bearing
     private class CompassListener implements SensorEventListener {
 
@@ -1881,6 +1984,30 @@ public class MapView extends FrameLayout implements LocationListener {
 
     }
 
+    private static class AttributionOnClickListener implements View.OnClickListener, DialogInterface.OnClickListener {
+
+        // Called when someone presses the attribution icon
+        @Override
+        public void onClick(View v) {
+            Context context = v.getContext();
+            String[] items = context.getResources().getStringArray(R.array.attribution_names);
+            AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle(R.string.attributionsDialogTitle);
+            builder.setAdapter(new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, items), this);
+            builder.show();
+        }
+
+        // Called when someone selects an attribution
+        @Override
+        public void onClick(DialogInterface dialog, int which) {
+            Context context = ((Dialog)dialog).getContext();
+            String[]links = context.getResources().getStringArray(R.array.attribution_links);
+            Intent intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse(links[which]));
+            context.startActivity(intent);
+        }
+    }
+
     /**
      * LOST's LocationListener Callback
      * @param location New Location
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml b/android/java/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml
new file mode 100644
index 000000000..0da674ac7
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:color="?attr/colorPrimaryDark"
+        android:state_pressed="true"/>
+    <item
+        android:color="?attr/colorPrimary" />
+</selector>
\ No newline at end of file
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_outline_black_24dp.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_outline_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b5ab06e19d61515cf3a7395db43a81bb30a8203
GIT binary patch
literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD00055Nkl<Zcmd_q
zF-l`$6vgqMc^Zo`23v74HbPLeuuw$YiAb<e&;bobm<@=dGRqK`F&ahm#SLhafm;N=
zkf&cWmH)3h_uND72|VACx;0&QN*_Ly?wnaQg?!A}_hvBW^|du+vZXYreqL<&lESay
z!e0lL%&V)Lx8%_MaMo3P9`i>S-P=?%O3jv@aJa6HGW<0ceyC!`rEoc~?j{U=`ic|b
z9N*QPsMv*+MQv@1i8kR%)UIh1`=XoCqqIYBOKErvea{GWZ!y>;D~RpT`=%tUi9cM8
zjMJd-5IZXpx*;AQpQG66NVp4e3Hh{Q=T<@);yl@>u@F125<Wt#lU+8`F?s(FLFs83
zLFs83WhX(IWuJw3i2R`An4C&j4e?$rJE+i$$+CpHe#l$dK|7(BCdV)I%wz@4dJ27)
zQJP+2beZ)Txe4#HhB0gy#5*zJGbVI|)4B?}!r)3n6|-)HOGhPzYhm(eTQO$7<4HLD
zR#T0_xq)~d9BElFZQ6pCW4+<5qvlICqW0?dY+WWzd-`KTO1m2J!ITvpw_d$__v+TE
dWs|-i{{WmHAv4QI(>nkF002ovPDHLkV1kFY-~<2w

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_outline_black_24dp.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_outline_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0c9fe0eb8457013fbfa6e2efea61fca70bb9303
GIT binary patch
literal 323
zcmV-J0lfZ+P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0003BNkl<ZI1#<U
z!AT=w00z)EIm}d|Xc3ES3xc93UOY@ti%|&JgQBHKumELHTQDY<Z*Twnt070<<F|Fr
zJQ}R53?7{7Y;fd5L_|cyyF+VD+=_V8+tO-no0^N5nfT#Wd^-2PMsFczzBv+~{#a+v
zLL8`cKE%0E#Aqtsw2CwFq!ux1%*Bb~QS>&s5ci5fY}sT-yed|rRg0)~VyRe(RxP5|
ziKSu?+iDTDUGbuL5L2~?+LgFdoQk=|C}Pxj7RQRtyXcJ~MwepHsvL@iJ?s4SCH8$Y
z6AQgYt#Ro~-1uQ)CSvZwj!tLSm1hyxCe}LeCL$stVz6(6)`@$smX==JIoA4R{{X3C
VfQx`Hg^K_H002ovPDHLkV1oM>kN^Mx

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_outline_black_24dp.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_outline_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b706f0d06a9a1e5e2f6606c01e84094ee6a99b42
GIT binary patch
literal 640
zcmV-`0)PF9P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0006<Nkl<ZcmeH|
z&q^Cn6vlsvlZde!NtjSu`vyf3BJn|lX3>o#<ONz1^8nhqwMf8rtJpv`Md(`;gR817
ziruJbp-S^-Gu<2x$joJC?$CnZ?=H`G&v$d~{W3goFG#aYi!Mj>88fEO5na|OlO{3G
z*yIPEVO{WsIjnKnVT>2DMzkql!ApMPMO=L<#3I9oI}LubOO+CNvScYxqQ)LKcQkDr
zB9h}Xp02N~GG)+JIYyNnkc)PDZO<QG;e@Cg3{VRkLV2(9W1bU*c}~$mg<h>nzu*#;
zB8R%~1(<R9rKfj^Ls5UlHF=Ee=<EZBqo)jFfuU5ljj7dGy@uEZ(A4NXA&^adn2wb}
zh7+l85I|c0b5_C10BTY{Cxwq?P3;u6Omiz;mhjP%(k@BZmo80wbfr`!33chx!N-x5
zN+h8yU3&QFODPZ5mkh2buJ9olAe+cwQnT>i4Rl0>e>Eb#WLtxfOV(#vvo;8MrfX8#
zOJwj-6b<u_yCG+7@Q7RUpwnDvmMsl*Kxd=~;H`emGFApzzDa$ZK;|?H4J(6|RENxB
zpe>RC^RW#U^^>`Uk%GqUlp=9>%y-#&$qZ(w=qV2=#%SNueJg~}R_Q4VL}5`+@9~aM
z91c`Iph*TZkfp^?^`Dp^0y)$Ij}vN48)8+LhbiruA|j3sO47|fb;`I*GKou>Ivq)^
z4u=V1QQ;ad;<{u73-W9;3T-}Qiy5qW$_D4g=4Y%kOJdS2(WFC<D@KgCqDO}YB~si2
a9{39-;{s}$p1&6W0000<MNUMnLSTYm?ipPG

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_outline_black_24dp.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_outline_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3847a9fe74774d3593dd694cff48ccca13cdec5a
GIT binary patch
literal 940
zcmV;d15^BoP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000AXNkl<ZcmeI$
zUuzUs7{~E%i0)QrCy}t*6>mdcfcOtJM6uO{+z8D@UxkKMBq1+Buz@6?P#P0jG1VJo
zr4$sRhK5k2Z=fXRN~6nW@y^{1KD~XI=}gYdoFjX&pWp3sm><rZJ;%_~wR(CyD$KCV
z2HP}f)26{T8!R)!6%O+imASzhZ6qcwUQ^{;oV&;~_7KB#s4<2!m-q`wku@%0-7$Vg
zGUNeAvFJxWAsN$T0xR;|i+IEi51FLGFhk_XF~l$xCRyP_#EN-xWHi7k5=w)4P7&uc
z3+y7HJf}bgCH_GIc}Eow6CO8tj|B3D5-AOY>a@9yM-m0@&<R!YNg*G4S^sjJG)}OI
z=<tFZiQPqXc#2P2gFHiYm`lFVMTej1CyN6tB0Bs)0>}6isAEB(Qj;>qRst`p9~=6q
zAu7LO=u+TQ_K7Dd@dg8*_ZUX>5!&WBSSti4^<9Bi7`TY2+y<+KU=~psWnX%OzQeO#
z$Y%%reeR=-{wJ-1^+Iq9eT6F#>jwG=^_&zcppV__#9BjN7F^M%z)NCy=&SoFTsf<r
z@|i<Ks-Ul5?(|VtPr6K`88!A0mmaAnO%rKZjZNZGRXyoGkv7y=1((Lvlh%o}t;U8i
zB`T&y)S4|KHPqOU(?UhHrcNZi>2ppC<<**2_ZI5@SJo9Db@pv9Dwel>@Q2Y|A^pR+
zXm)h0I4$&8t(hXy6*cz3S)t(J`aO{jqc{F(SB1>4AMjd@E;uWs|KhZ2{;};ky2AQ2
z)rxDxD$`NJH=PukQuA$!?4zc}-&3$&Xn>Du{t5dULsafqFEod!oWp?rpGSuiRtueB
z&+LQNE+8tK3|cF6gtuz;3+FNP08y#Yj|~U-15sJR*io8@$}eQs#}cB_phN-_NT5>I
zKj|$a=v*bC1q7WMgQRsN@Unzi63g)%L1&Ybq;ZC~2s(dqkQ990An0_M#V3gY=Ga5f
z`5TXvN})=^4!0;^!e^R~NT^Pc418W7q3m*(v-A<Ak8|A9J5{|bkBoB6BmbK^kEk-v
z2u1SbDKf%1RUT81Sn(4Fv0{QIk}(agVo{mjGL-qk5+$q~;}w!3tBm5zC{O7ihH3MJ
z^Eg-HIxlG<G5O3Y*C_H89pW<6+-IFF>a=K4XNz?fnc_RXp{J*(OZ^8ac7(2N>$@cY
O0000<MNUMnLSTaLVzg%f

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_logo_mapbox.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_logo_mapbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1260a16f378a9e45a54b9025ba8c322ba9b54db
GIT binary patch
literal 7059
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

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_outline_black_24dp.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_outline_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1e2a03a4bc540419ce1165d5dedd8d5345fdec2
GIT binary patch
literal 1256
zcmV<E1Q+{>P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000E9Nkl<ZcmeI&
z%}-QU7{~FiOk$iF22A8d5@W;;R&=9rXJX@~RYQHvL=BB5{Rey@gNmXiZZ*0iAP8ww
zBPF<Xfo~f_O4BU~Z2>W$LQv#I8j8T_{yf~=m$~;IXzu5?eh%l+bI*O5LnIQ3L?S-g
zNEKIT<0XBJGshx}%rQ<MFKFcoRg|(K<&&X>L6n2^)65BytPpur(aAq3mzkx5L*!vp
z0a@Ola>x)hq%a~$J)clM<Rf(?2-z9lqI}FS)r4j%&rt!Si!FrUM`lm~Wr{NdD$dUi
z7DESh9Ag({#EB6jP8qv7&Q&@Xv8``m9Rb<MA1KQ#@rv`Lu~WfCx=~o?H%bV=Hmo<y
zPuwPr8x`DP%5uCxzQSia8MXLh6V#EyivsGIv>5drmH23z#q<|xU<0`*qKPGo7Si~n
z%wqBU&0hSlj{%E?RDuuU7MJcXB=Jj%b`&x_e(Xp;ExUAT@Y|(jm(qjWZ(B;_Uor&Y
z6!R#Nv*chaGsx+GPf(5^TbQOC&z>U}Plh0!MlPf-JUW9CsUc{WQ6klNkmN0L=W$Hb
zI`=E``6_{H*O2>uGL!}iknh%)aH)U^vHJHyC=I|j;!5~HKCWcN1R5Z;2B2BgU%-W!
zczBp#L#PcDi)Yo><l$HqN=qGt+5p@XBOJi7PVu~-3cZ0s@qh3Lhw{Z|s@o8H18`Rx
z;WG&w$%vQ5G$w3EX*r4`En3+tOzF{P(ufn{HgX;_<YxXS4s1keNn^?mF_&WZTj($*
zz1L=Q5L;KYk`By~8+t9a+T<<FpzGRfnz8j#D>;Taa!Y@Ptv;<}7l4r)8NeQGlwNF&
zYb9ky8`z|cGKQ@=tt4)=frR*F&DNq;5;NLBOdDlk)i<!(mQYeIq5t_sEVt3!t8E*7
zp_Lpr*nqr|J;he5R&v#712?o$?t6HcGupsoZIrD0$LSHH4UD?~GEs`sQemutonBsO
zpkFJxXsm%+@k;6GvtGBc27dSUdGmz$tWsg5fl4vPVH`;^s}<fc(!f1!gc;&E)FDoh
z6olTudhz?*LmWGV(o!FK1GmHo-{DvuLt619MWHrO%Cz|1ehn_vhzT@>+CZzQKZh$R
zK8n3)UuX^N7uDk=aj8xWGC(Sn1_~Jx)mdCiFf4{?52b-lQTv8C9#o@5E)leAD3OzR
z)Fn^Gaf%@QAdedG1kbj}b8XCXgrFSb3rcL@n*sbhFEP*Qfd2Kr_;5}_cz_aF;&K3M
ze+ebhM9$XHgOZ`06n-hB6D318Yw<w|gD4pW*oPnXGlY_%pCWvc=AFf9-DZl(MJa8l
zW%HJDd{k-Cf?|rB6yn8tZZT~!>ImEMS(?`<%O>vfHEvXL&vNpLe#!|zDLp9b&_k9T
z*x5;~c-Pf0-68_APCn*}yr+}vWZ1(d62yp+WD|SHaD&H;+SWI+mO!0l8Wm6`sU`&F
zbfE&s6E+i?YKBohW{8u7EWu?ypnS+US>hOx&jq=;y2>EuNMckT2YAG1l*`QUkZ)PT
z3X$L_jr@gjkUknXOq>;|goD)5%rkl!W0nOLm}QJ!o^qco2Ph^Ii9{k1-~0zqnGDmx
SqDLYC0000<MNUMnLSTX%6+fW>

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/arrays.xml b/android/java/MapboxGLAndroidSDK/src/main/res/values/arrays.xml
new file mode 100644
index 000000000..3e937722c
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/values/arrays.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="attribution_names">
+        <item>&#169; Mapbox</item>
+        <item>&#169; OpenStreetMap</item>
+        <item>Improve this map</item>
+    </array>
+    <array name="attribution_links" formatted="false" translatable="false">
+        <item>https://www.mapbox.com/about/maps/</item>
+        <item>http://www.openstreetmap.org/about/</item>
+        <item>https://www.mapbox.com/map-feedback</item>
+    </array>
+</resources>
\ No newline at end of file
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/android/java/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
index 7148429db..901044375 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
@@ -11,7 +11,67 @@
         <attr name="styleUrl" format="string" />
         <attr name="accessToken" format="string"/>
         <attr name="styleClasses" format="string"/>
-        <attr name="compassEnabled" format="boolean" />
         <attr name="myLocationEnabled" format="boolean" />
+        <attr name="compassEnabled" format="boolean" />
+        <attr name="compassGravity">
+            <flag name="top" value="0x30" />
+            <flag name="bottom" value="0x50" />
+            <flag name="left" value="0x03" />
+            <flag name="right" value="0x05" />
+            <flag name="center_vertical" value="0x10" />
+            <flag name="fill_vertical" value="0x70" />
+            <flag name="center_horizontal" value="0x01" />
+            <flag name="fill_horizontal" value="0x07" />
+            <flag name="center" value="0x11" />
+            <flag name="fill" value="0x77" />
+            <flag name="clip_vertical" value="0x80" />
+            <flag name="clip_horizontal" value="0x08" />
+            <flag name="start" value="0x00800003" />
+            <flag name="end" value="0x00800005" />
+        </attr>
+        <attr name="compassMarginLeft" format="dimension"/>
+        <attr name="compassMarginTop" format="dimension"/>
+        <attr name="compassMarginRight" format="dimension"/>
+        <attr name="compassMarginBottom" format="dimension"/>
+        <attr name="logoGravity">
+            <flag name="top" value="0x30" />
+            <flag name="bottom" value="0x50" />
+            <flag name="left" value="0x03" />
+            <flag name="right" value="0x05" />
+            <flag name="center_vertical" value="0x10" />
+            <flag name="fill_vertical" value="0x70" />
+            <flag name="center_horizontal" value="0x01" />
+            <flag name="fill_horizontal" value="0x07" />
+            <flag name="center" value="0x11" />
+            <flag name="fill" value="0x77" />
+            <flag name="clip_vertical" value="0x80" />
+            <flag name="clip_horizontal" value="0x08" />
+            <flag name="start" value="0x00800003" />
+            <flag name="end" value="0x00800005" />
+        </attr>
+        <attr name="logoMarginLeft" format="dimension"/>
+        <attr name="logoMarginTop" format="dimension"/>
+        <attr name="logoMarginRight" format="dimension"/>
+        <attr name="logoMarginBottom" format="dimension"/>
+        <attr name="attributionGravity">
+            <flag name="top" value="0x30" />
+            <flag name="bottom" value="0x50" />
+            <flag name="left" value="0x03" />
+            <flag name="right" value="0x05" />
+            <flag name="center_vertical" value="0x10" />
+            <flag name="fill_vertical" value="0x70" />
+            <flag name="center_horizontal" value="0x01" />
+            <flag name="fill_horizontal" value="0x07" />
+            <flag name="center" value="0x11" />
+            <flag name="fill" value="0x77" />
+            <flag name="clip_vertical" value="0x80" />
+            <flag name="clip_horizontal" value="0x08" />
+            <flag name="start" value="0x00800003" />
+            <flag name="end" value="0x00800005" />
+        </attr>
+        <attr name="attributionMarginLeft" format="dimension"/>
+        <attr name="attributionMarginTop" format="dimension"/>
+        <attr name="attributionMarginRight" format="dimension"/>
+        <attr name="attributionMarginBottom" format="dimension"/>
     </declare-styleable>
 </resources>
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDK/src/main/res/values/strings.xml
index ff91a160d..455fdb026 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/values/strings.xml
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/values/strings.xml
@@ -4,4 +4,7 @@
     <string name="infoWindowTitle">Title</string>
     <string name="infoWindowDescription">Description</string>
     <string name="infoWindowAddress">Address</string>
+    <string name="attributionsIconContentDescription">Attribution icon. Click to show attribution dialog.</string>
+    <string name="attributionsDialogTitle">Mapbox for Android</string>
+    <string name="mapboxIconContentDescription">Mapbox logo.</string>
 </resources>

From 75aefb7f9d98beb5c9d59587d4e47e377fda9b2d Mon Sep 17 00:00:00 2001
From: tobrunvannuland <tobrun.van.nuland@gmail.com>
Date: Wed, 2 Sep 2015 20:49:54 +0200
Subject: [PATCH 3/9] Added save/restore state for CompassView, LogoView and
 AttributionView

---
 .../com/mapbox/mapboxgl/views/MapView.java    | 66 ++++++++++++++++++-
 1 file changed, 63 insertions(+), 3 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 7bb9f4327..1dee4e217 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
@@ -100,9 +100,24 @@ public class MapView extends FrameLayout implements LocationListener {
     private static final String STATE_ACCESS_TOKEN = "accessToken";
     private static final String STATE_STYLE_CLASSES = "styleClasses";
     private static final String STATE_DEFAULT_TRANSITION_DURATION = "defaultTransitionDuration";
-    private static final String STATE_COMPASS_ENABLED = "compassEnabled";
     private static final String STATE_MY_LOCATION_ENABLED = "myLocationEnabled";
     private static final String STATE_USER_LOCATION_TRACKING_MODE = "userLocationTrackingMode";
+    private static final String STATE_COMPASS_ENABLED = "compassEnabled";
+    private static final String STATE_COMPASS_GRAVITY = "compassGravity";
+    private static final String STATE_COMPASS_MARGIN_LEFT = "compassMarginLeft";
+    private static final String STATE_COMPASS_MARGIN_TOP = "compassMarginTop";
+    private static final String STATE_COMPASS_MARGIN_RIGHT = "compassMarginRight";
+    private static final String STATE_COMPASS_MARGIN_BOTTOM = "compassMarginBottom";
+    private static final String STATE_LOGO_GRAVITY = "logoGravity";
+    private static final String STATE_LOGO_MARGIN_LEFT = "logoMarginLeft";
+    private static final String STATE_LOGO_MARGIN_TOP = "logoMarginTop";
+    private static final String STATE_LOGO_MARGIN_RIGHT = "logoMarginRight";
+    private static final String STATE_LOGO_MARGIN_BOTTOM = "logoMarginBottom";
+    private static final String STATE_ATTRIBUTION_GRAVITY = "attrGravity";
+    private static final String STATE_ATTRIBUTION_MARGIN_LEFT = "attrMarginLeft";
+    private static final String STATE_ATTRIBUTION_MARGIN_TOP = "attrMarginTop";
+    private static final String STATE_ATTRIBUTION_MARGIN_RIGHT = "attrMarginRight";
+    private static final String STATE_ATTRIBUTION_MARGIN_BOTTOM = "atrrMarginBottom";
 
     // Used for positioning views
     private static final float DIMENSION_SIXTEEN_DP = 16f;
@@ -834,9 +849,30 @@ public class MapView extends FrameLayout implements LocationListener {
                 setStyleClasses(appliedStyleClasses);
             }
             mNativeMapView.setDefaultTransitionDuration(savedInstanceState.getLong(STATE_DEFAULT_TRANSITION_DURATION));
-            setCompassEnabled(savedInstanceState.getBoolean(STATE_COMPASS_ENABLED));
             setMyLocationEnabled(savedInstanceState.getBoolean(STATE_MY_LOCATION_ENABLED));
             setUserLocationTrackingMode((UserLocationTrackingMode) savedInstanceState.getSerializable(STATE_USER_LOCATION_TRACKING_MODE));
+
+            // Compass
+            setCompassEnabled(savedInstanceState.getBoolean(STATE_COMPASS_ENABLED));
+            setCompassGravity(savedInstanceState.getInt(STATE_COMPASS_GRAVITY));
+            setCompassMargins(savedInstanceState.getInt(STATE_COMPASS_MARGIN_LEFT)
+                    , savedInstanceState.getInt(STATE_COMPASS_MARGIN_TOP)
+                    , savedInstanceState.getInt(STATE_COMPASS_MARGIN_RIGHT)
+                    , savedInstanceState.getInt(STATE_COMPASS_MARGIN_BOTTOM));
+
+            // Logo
+            setLogoGravity(savedInstanceState.getInt(STATE_LOGO_GRAVITY));
+            setLogoMargins(savedInstanceState.getInt(STATE_LOGO_MARGIN_LEFT)
+                    , savedInstanceState.getInt(STATE_LOGO_MARGIN_TOP)
+                    , savedInstanceState.getInt(STATE_LOGO_MARGIN_RIGHT)
+                    , savedInstanceState.getInt(STATE_LOGO_MARGIN_BOTTOM));
+
+            // Attribution
+            setAttributionGravity(savedInstanceState.getInt(STATE_ATTRIBUTION_GRAVITY));
+            setAttributionMargins(savedInstanceState.getInt(STATE_ATTRIBUTION_MARGIN_LEFT)
+                    , savedInstanceState.getInt(STATE_ATTRIBUTION_MARGIN_TOP)
+                    , savedInstanceState.getInt(STATE_ATTRIBUTION_MARGIN_RIGHT)
+                    , savedInstanceState.getInt(STATE_ATTRIBUTION_MARGIN_BOTTOM));
         }
 
         // Force a check for an access token
@@ -867,9 +903,33 @@ public class MapView extends FrameLayout implements LocationListener {
         outState.putString(STATE_ACCESS_TOKEN, getAccessToken());
         outState.putStringArrayList(STATE_STYLE_CLASSES, new ArrayList<>(getStyleClasses()));
         outState.putLong(STATE_DEFAULT_TRANSITION_DURATION, mNativeMapView.getDefaultTransitionDuration());
-        outState.putBoolean(STATE_COMPASS_ENABLED, isCompassEnabled());
         outState.putBoolean(STATE_MY_LOCATION_ENABLED, isMyLocationEnabled());
         outState.putSerializable(STATE_USER_LOCATION_TRACKING_MODE, getUserLocationTrackingMode());
+
+        // Compass
+        LayoutParams compassParams = (LayoutParams) mCompassView.getLayoutParams();
+        outState.putBoolean(STATE_COMPASS_ENABLED, isCompassEnabled());
+        outState.putInt(STATE_COMPASS_GRAVITY, compassParams.gravity );
+        outState.putInt(STATE_COMPASS_MARGIN_LEFT, compassParams.leftMargin);
+        outState.putInt(STATE_COMPASS_MARGIN_TOP, compassParams.topMargin);
+        outState.putInt(STATE_COMPASS_MARGIN_BOTTOM, compassParams.bottomMargin);
+        outState.putInt(STATE_COMPASS_MARGIN_RIGHT, compassParams.rightMargin);
+
+        // Logo
+        LayoutParams logoParams = (LayoutParams) mLogoView.getLayoutParams();
+        outState.putInt(STATE_LOGO_GRAVITY, logoParams.gravity);
+        outState.putInt(STATE_LOGO_MARGIN_LEFT, logoParams.leftMargin);
+        outState.putInt(STATE_LOGO_MARGIN_TOP, logoParams.topMargin);
+        outState.putInt(STATE_LOGO_MARGIN_RIGHT, logoParams.rightMargin);
+        outState.putInt(STATE_LOGO_MARGIN_BOTTOM, logoParams.bottomMargin);
+
+        // Attribution
+        LayoutParams attrParams = (LayoutParams) mAttributionsView.getLayoutParams();
+        outState.putInt(STATE_ATTRIBUTION_GRAVITY, attrParams.gravity);
+        outState.putInt(STATE_ATTRIBUTION_MARGIN_LEFT, attrParams.leftMargin);
+        outState.putInt(STATE_ATTRIBUTION_MARGIN_TOP, attrParams.topMargin);
+        outState.putInt(STATE_ATTRIBUTION_MARGIN_RIGHT, attrParams.rightMargin);
+        outState.putInt(STATE_ATTRIBUTION_MARGIN_BOTTOM, attrParams.bottomMargin);
     }
 
     // Called when we need to clean up

From f8b8ca72735237e91a2d215366a662fe0def6d89 Mon Sep 17 00:00:00 2001
From: tobrun <tobrun.van.nuland@gmail.com>
Date: Sun, 6 Sep 2015 15:16:56 +0200
Subject: [PATCH 4/9] Refactored ColorStateList of attribution control to a
 Drawable selector, added images responding to different states.

---
 .../java/com/mapbox/mapboxgl/views/MapView.java  |   8 +-------
 .../res/drawable-hdpi/ic_info_blue_normal.png    | Bin 0 -> 2194 bytes
 .../res/drawable-hdpi/ic_info_blue_pressed.png   | Bin 0 -> 2133 bytes
 .../drawable-hdpi/ic_info_outline_black_24dp.png | Bin 487 -> 0 bytes
 .../res/drawable-mdpi/ic_info_blue_normal.png    | Bin 0 -> 1354 bytes
 .../res/drawable-mdpi/ic_info_blue_pressed.png   | Bin 0 -> 1391 bytes
 .../drawable-mdpi/ic_info_outline_black_24dp.png | Bin 323 -> 0 bytes
 .../res/drawable-xhdpi/ic_info_blue_normal.png   | Bin 0 -> 2710 bytes
 .../res/drawable-xhdpi/ic_info_blue_pressed.png  | Bin 0 -> 2738 bytes
 .../ic_info_outline_black_24dp.png               | Bin 640 -> 0 bytes
 .../res/drawable-xxhdpi/ic_info_blue_normal.png  | Bin 0 -> 4256 bytes
 .../res/drawable-xxhdpi/ic_info_blue_pressed.png | Bin 0 -> 4240 bytes
 .../ic_info_outline_black_24dp.png               | Bin 940 -> 0 bytes
 .../res/drawable-xxxhdpi/ic_info_blue_normal.png | Bin 0 -> 730 bytes
 .../drawable-xxxhdpi/ic_info_blue_pressed.png    | Bin 0 -> 836 bytes
 .../ic_info_outline_black_24dp.png               | Bin 1256 -> 0 bytes
 .../src/main/res/drawable/ic_info_selector.xml   |   5 +++++
 17 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_normal.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_pressed.png
 delete mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_outline_black_24dp.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_normal.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_pressed.png
 delete mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_outline_black_24dp.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_normal.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_pressed.png
 delete mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_outline_black_24dp.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_normal.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_pressed.png
 delete mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_outline_black_24dp.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_normal.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_pressed.png
 delete mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_outline_black_24dp.png
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml

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 1dee4e217..dda11c8f5 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
@@ -9,9 +9,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
-import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
-import android.content.res.XmlResourceParser;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
 import android.graphics.PointF;
@@ -30,7 +28,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v4.view.GestureDetectorCompat;
 import android.support.v4.view.ScaleGestureDetectorCompat;
 import android.text.TextUtils;
@@ -423,10 +420,7 @@ public class MapView extends FrameLayout implements LocationListener {
 
         // Setup Attributions control
         mAttributionsView = new ImageView(mContext);
-        Drawable attrDrawable = ContextCompat.getDrawable(mContext, R.drawable.ic_info_outline_black_24dp);
-        attrDrawable = DrawableCompat.wrap(attrDrawable);
-        DrawableCompat.setTintList(attrDrawable, getResources().getColorStateList(R.color.material_bg_selector, mContext.getTheme()));
-        mAttributionsView.setImageDrawable(attrDrawable);
+        mAttributionsView.setBackgroundResource(R.drawable.ic_info_selector);
         mAttributionsView.setContentDescription(getResources().getString(R.string.attributionsIconContentDescription));
         LayoutParams attrParams = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         mAttributionsView.setLayoutParams(attrParams);
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_normal.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..de44e3ddc08a6ec2733d5f9a9aef169c0cf97805
GIT binary patch
literal 2194
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
J-NNtuzX40N*J=O&

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_pressed.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa26786242c07a74e6de23c0e89703a50ad9b84f
GIT binary patch
literal 2133
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
BzA^v+

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_outline_black_24dp.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_outline_black_24dp.png
deleted file mode 100644
index 4b5ab06e19d61515cf3a7395db43a81bb30a8203..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD00055Nkl<Zcmd_q
zF-l`$6vgqMc^Zo`23v74HbPLeuuw$YiAb<e&;bobm<@=dGRqK`F&ahm#SLhafm;N=
zkf&cWmH)3h_uND72|VACx;0&QN*_Ly?wnaQg?!A}_hvBW^|du+vZXYreqL<&lESay
z!e0lL%&V)Lx8%_MaMo3P9`i>S-P=?%O3jv@aJa6HGW<0ceyC!`rEoc~?j{U=`ic|b
z9N*QPsMv*+MQv@1i8kR%)UIh1`=XoCqqIYBOKErvea{GWZ!y>;D~RpT`=%tUi9cM8
zjMJd-5IZXpx*;AQpQG66NVp4e3Hh{Q=T<@);yl@>u@F125<Wt#lU+8`F?s(FLFs83
zLFs83WhX(IWuJw3i2R`An4C&j4e?$rJE+i$$+CpHe#l$dK|7(BCdV)I%wz@4dJ27)
zQJP+2beZ)Txe4#HhB0gy#5*zJGbVI|)4B?}!r)3n6|-)HOGhPzYhm(eTQO$7<4HLD
zR#T0_xq)~d9BElFZQ6pCW4+<5qvlICqW0?dY+WWzd-`KTO1m2J!ITvpw_d$__v+TE
dWs|-i{{WmHAv4QI(>nkF002ovPDHLkV1kFY-~<2w

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_normal.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd50478ac143d77b36c6a74c5fdcf6183f8a3b89
GIT binary patch
literal 1354
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&a=a>mHakcg59UmvUF{9L`nl>DSry^7odplSvNn+hu+GdHy)QK2F?C$HG5
z!d3~a!V1U+3F|8<fR&VF+bTu)1}He^7o{qg>Y3;nDA{o-C@9zzrKDK}xwt{K19`Se
z86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx<D1W#g%y_i50qe#mW#vVCJ}_7AF^F
z7L;V>=P7{9O-#x!EwNQn0$BtH5O<bjrXg&~D~5Ut=s|sujJ~0sfj-=9pjI1@sFi<F
zW-8ETkok6oHei(~Vo-Z*^g)&*IR@fWuqe>0c3d|4@L;p!@;Rg)$-uze<>}%W;=#K$
z^sK*dpuqf_x*Q^1x<X9pNgcn~9~?dMB3|Lr<d2s)#J?y^m?3dk$T^9r!a*-&r-Z-j
zo*5OBJa%xDn`Z40R@xF2<#6L}VOp8|(uNS>nv=J`8}9#k_O`h^|AQsZCa?wvhcdLd
zC+<-<IymP-Utowy)8~V1&sSxaB>Nk4a<8t5{Jkap>3j9fZpUtLB-_Sa{ugIqnRTF0
zr$9zEORD;=W6Dy2mt2o;ORo8SMrnDR+96h#`l{Lo&%&QtFOdG^ytDCL53jMOC8x@<
z^!5o4CSEPL#&(<S*Vg2ck|V~Z4D;CkJ@fC^e_gn3e|7{byG2T@kw8?wWUXYW;V-$x
zymM>B9c~{D{r5Su?66GKl5ht*C571JuOipnq7OJNc=Rl(rR#b)d%pNjwr}|dB_;$;
zoqa6LKFQ>o=WW(|AJtc8{Z9OLZ|$CW?=Gkte$;BK-m2UXCV%bP=81nE{c^beRAAYh
z#>NAlc}XS5HolT>|8b?p;Z@}8{U2iv3h8P;*A)9LIJwmB{+#w}?>YAFt=?p3{_h!|
z;<BIl2lR7z(%E;<z3@@box6Qz^FE6y^*@E@A6Yi{(37hA>#+q!S3gMFeDwa~x$I)s
zjaNSRzgiXXPm)&nUMpyEYtnAt$D7Y@ShlbK|D0Nn=~q6U$#u-WH7!^mO0!UdIqYdv
z3jc#{?wNVLGO>&9*p^=oIVO>}NO{+(gE3s3JDOD<?T*i?GxWFVTM;1alm4tZH#q<G
zlFx1@J3O4%yl9j0ZWNNAy-~&Ui1b^jt|w<#8p!F-wQ*>kzTWNS!%Zd<I<MOv-jORv
zn(%DW!Zk}<YS^D1nd5tC%8ZKZ50W0vE}5xatzkT^XI;U}HT@EaODAsQ>JVJ*Szxrj
z#k|N=VQcGwXC;ZL7Aq?jwk-{`v*}v*P{42E=XL{~nA5ZVWfZp+oqj5^;Io%}b875U
zh8RAJqbGwi|8o0HVO^<vCuq{bSuT@4rS>i<DYn1Ba+q_uRg9HWU#07pCCXxJzG!Gq
zve#|x7GCRmIbKj)X~LX9<%sa}OIfZjVJ~J|(PMbW#r>5~@s2rKmsj1}_K5Y|uhT&n
z1LkIn96fvY$1!>Dqt})#o@)BU<f6cjwyFNRZ_G4M4NhA6WS6VK(_Q@AHqP#qi(gmH
zKkfCNY1w;cC7;^*F8kxJe15+KrZe+TZ2C0W^H0hldz+cZIM|P7+Wt~K^*HTQSjJMG
jSAmu--(A#Z2;a(oxs7FmwxL@usDSfy^>bP0l+XkKQZzk)

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_pressed.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..d377f3cb8c2fc5a059efd69f58ba5908ed76066c
GIT binary patch
literal 1391
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&a=a>mHakcg59UmvUF{9L`nl>DSry^7odplSvNn+hu+GdHy)QK2F?C$HG5
z!d3~a!V1U+3F|8<fR&VF+bTu)1}He^7o{qg>Y3;nDA{o-C@9zzrKDK}xwt{K19`Se
z86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx<D1W#g%y_i50qe#mW#vVCJ}_7AF^F
z7L;V>=P7{9O-#x!EwNQn0$BtH5O<bjrXg&~D~5Ut=s|sujJ~0sfj-=9pjI1@sFi<F
zW-8ETkok6oHei(~Vo-Z*^g)&*IR@fWuqe>0c3d|4@L;p!@;Rg)$-uz8-qXb~#DjNk
zm~W0xporafzfAAt8Ox;XyVX=C-MYE5wX9u(GtErMGrUYm(@ZE%SI5Qm&6-`CW;!~%
zs*0s9l+O0$NL+j+B-4HC)tS{b&-aw4Kl|GMMXmf^?f07R*7o1$d~VCwdN4<0t}jE<
zw8mDWgKLb!#Mp8)4bIKKTUTDtJa=YlWx4e0vo~(8yC3J)z2RxC&NMB7?w-I!Yq!g9
zog&ut_Smf0Gk18lynB2-;mOU9?MHUanwbB*zh67^YUFyAbqlyI+$sOxkzCAi;OvIO
zk1XHwyPl6y663FrI(+_<?eclA>O|Z3go{)-PKcd<E8*P6t<{R{M{W4(-A>%v?)9L4
z&TZ!S+m08NY>w?T7vBGqk9DT~lbs4HK32$23lVz4Qslll=WIc8V%3M>3%23MLdD)k
zHUE2l`J`{`u|jqAH}^s=&7G~V>*Y=ssVafkAdzV%Z|0Tye6NeK`swv^(}^V)P4e%5
zTjF=`_&%Ari?_{L=(9}aeRQ6UMFQ_!wrJZ!Q!f{|&e^f;L(o^J?xUv<m~Sw2o@}dL
zB*Js}@btc>16#lGUl&zVU(b=aY30jX%io=|eDgSuPwBQ*w{I=~<+h&&NA|DLjy)fL
zsz&sk)Tt*=n7k+HZeS2UHD6U{@}ZKgi(QrlhdmTXUga)e;Nc}AU@EqZjhpvmEypRo
zbfMpj(gJzjJA0m4#oXjov{@q9yR${rC*0R}<B#9^<)O=><h3TXq%wt_%P`_-FJffK
z+c<A&hrl$EYoDLyNXqgS+o@c-A2w^F(duo7mL6}LX{H}@h*NQusI#_-mQwJcugBWk
zQlGEQsa?46W1CN;`-F%Sr_v8TU0t`*w6JJT>#sW{dncHl=((0EDW=UAs<4;UCX4rz
zW!lv9DTxiQU1y4Jv$!(fRqsaYr5Fj>hOLE)M+1~YyjKLMW@LB!>Gwsn-m7+(Tb;i1
z+NRU}@ixZF9^GYYW<5AiE#vTeVOdDVT(OIbwzLSE8m$h^kX`uTiO&tIghht(qRnqM
zP4Ug1<rRM9nZLyqrKjr~?um19Rb3Un-4T|%Lm~J&lfcXbgJtGw{SP;ax}9tIu=S1L
zCT*U>|F?9>1QxSretQysL1(Gs2A|aiZER{)es<sPcl^+O=(9?{T=CwUWno!mDv2M@
z`u!5vCzubEz9aJZ?+T3x72cuiw#IT-F5IysHe95`Ydy>9|NkBs_%D3O^Y?f2<Jwh0
zn_j64XP#}dk2tP;%TiqO#mh%>KVmE0#NThf_Uq#J=hN%E%(egLDo*80oBC0_>&pLf
T$EjPVfl5J7S3j3^P6<r_xS>lN

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_outline_black_24dp.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_outline_black_24dp.png
deleted file mode 100644
index e0c9fe0eb8457013fbfa6e2efea61fca70bb9303..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 323
zcmV-J0lfZ+P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0003BNkl<ZI1#<U
z!AT=w00z)EIm}d|Xc3ES3xc93UOY@ti%|&JgQBHKumELHTQDY<Z*Twnt070<<F|Fr
zJQ}R53?7{7Y;fd5L_|cyyF+VD+=_V8+tO-no0^N5nfT#Wd^-2PMsFczzBv+~{#a+v
zLL8`cKE%0E#Aqtsw2CwFq!ux1%*Bb~QS>&s5ci5fY}sT-yed|rRg0)~VyRe(RxP5|
ziKSu?+iDTDUGbuL5L2~?+LgFdoQk=|C}Pxj7RQRtyXcJ~MwepHsvL@iJ?s4SCH8$Y
z6AQgYt#Ro~-1uQ)CSvZwj!tLSm1hyxCe}LeCL$stVz6(6)`@$smX==JIoA4R{{X3C
VfQx`Hg^K_H002ovPDHLkV1oM>kN^Mx

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_normal.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..df7d7a88757135f8ae6c25f83f04e8d1340757b3
GIT binary patch
literal 2710
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
HsDH{|I2Gyg

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_pressed.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5b183364174112edbcd242539676f7ad7e83ffb
GIT binary patch
literal 2738
zcmY*bdpr|rAKzSOOi{T+%qWD-y*3->?&Q)T8M!Tt<u*1plzZ-q%5`(AjxHh!hb~%i
zM2JMhEVm{(YOF%Una+97`@YZT^E|)j_kF(4_xt>wzkXTAoopfC{a^q90I|2Ta^Xka
zoe2`*ukHft8T<ewyVzO)>R&1@@DnkTod+2J5Z|*ifq*iG9G~DpJb|O&934>p5n*tA
zK*Z@lI4z9CX9ECe8j8OS3#8zow6M@{GKz+Q{bZo{`yChogZ`vYLNG9#<8i2EL{uQu
z2yO`1g_(k(P$)VofPiwbviavaKf}O+DHIY4fuK^UaH;`3A}R=>heRR~y7~xxeH}hS
zha4MD!P9iY$*O;g{71(sknA5tBvFVF;m{pj{OO2j3I+z-G5UA>{Z0yz@L#8J@;_zq
z3q<UkAoSq6h<~;DSJ68t$~lS{$amh+H`PP`Wd0xaj}IELWBxyn`Mc7eD8E!wFdFgi
zx0!++o~e5P0H76nE9{A2;SmqVP{lu_>nl9AMf_(f1wmqDT6Tj_2FO~ml?f4&hIL8L
zSir3mm7L8%0xE&|QvjjeAW0IFm2Y7V+RcE99)&8!i6(5O(T2!EGpFM%Ni(#^Y<T<K
znjmV-qeQ(H!LWf(eH7}5yP3DQx7Ny$h;UIZ_1Y~HCeQhj!zDW>MrM4?vqr{!NFBWe
z)kp$7?VT6(E<9_<LL77ad~YkdG&8~RlUIMm5<NvttnS{y-cZM+D@3r%NFHXDO<}2z
z(xP2wD3x&@vh!s`EfJd`#K(kO27LH-)PqOgek3k}yI+T1YT#KKTz=_atr~sWfZ_9F
zD66{J^K31OYG8iRBC)u-R=`LAy_IcT)uAz!^TodpV8iI3zbh|Bh|G@9KSArq0|gmx
zpSD%hy?UtZVretBz?OAlH*k&(q)cL^5`~k7t-R#D5auP2DV%7@nb&_%Kit=o3n8Dd
zwNGub+haIP%Xhz6cSJmZb8a@TJ*zOwa&QQkS49*Qd!9saT)cfSNv>1)fgv_s^`ZOJ
zs1e1oTi14qH1pjrD`9Xgju=36l2opL*4%2G9m7&PNd?O35rRVepPQAW`=YBpW_ZsX
zw#kAH(J|cm!&aK9Q|?AzM_llbP(Mf~{9{KN9S|$g^`{`0XN);o6L)|F_jJo*Yb&>f
zuwe?c8)(nO7#V0Ve)Ik6-PGl6VTWNqqmh={r}));?Ke-U1vzFOj~=Wff+xz{XyWG`
zw)9DLqvK0XU*qV`SVk9NA1-xqvXG_KyX#%QHT#wHk}zn`t=L!NmVm|nFW6HvU%_dG
z+nwyhM>GoO2I_;*OQRp*ArE+~H`Pc*gNG{3)-QVQotz&2T-^PGaF^)T3Og$u0#6vx
zeud3^ldC;$KEYjIF6@ytr$N6`?<FlvcaS!nWtGd<J4-GBPu(AoA&OG(M>@```=Vn_
zn#c;t9d!+BZxy{94)?0&Tzp&Bt?S`Cd#zjTi|#nG{OA^2kiC%SbU;RF>!v);-3wAy
zTK;>(cSH7k(>Qdp<3L?>ZqD0<vE@Atl+E4Y>!CSb<&riZ+dWWGTu0Ply?wU`_^Zq8
zrqc9Z%uN7I`veE1)ELRmPKDjA2i9%{gp&><_thh<YGm?K6!KgTx`Kigc1a4)GB?aI
zorI#71&2M81{MwlM*8%$icCkYFKb+)_Jx5=+X7W>)gLym3q8@-|Grl#eGJ&_E$4yU
z=(C6lhFmm0L_fYQY1m)>h?R4&AyoX7T6)R8&=}_$x;Jl=Ag(5sm9x}vb*yT4WW#m2
zuvR|^`dp*Y8cL=>GfF<iK!P`ec^4geU2J>~>mxJWT9ph`w9V?_h~~=IT?JHFX=8R<
z-?3E#<-O_(U*MUH2rQuxvz8K`dJZ*@IQ?~!gEKmZboEjfZ2DzgA?6#OOvDRiUhc;?
zJXRFv7?Wn)d?+df=f8E_SE?7|LJ=!MT+A0hhk!$Ro<BJRh}UW&hBgHgPihupHv+#`
z#kuEQI|?a&JNE6J%)t+fIMD$^76F^GO|Ho!I>VNxyKp>I|0MHG)d!8n>QzxO9P*xu
z`53lT+EO~85EKcb+bO(g>4>6`8T0fO9nsdMlA;62qOljY6^oPch%UYKliJ?%*ID6}
zZTZB?45{FA$|pMeq<q77AMkxE)b;1&nK|M7E_#njgOJ09gnxF2?h);zVzhnTdO`FT
zKiOPe(O-Qdzxag|E8*rj7jLz>rYZ!<xE_jEkDeaXk*I#$%*?UJr)hwHbf|Ev@A;sY
zjKutgORc3*jLPMj61NzvIrA5;R`2`y#<X;#PjPQ8jcN$O`#%_L3}5-y*V33<eQZ<k
zRCSmPRAH)5fOdP{$HRFv;tacuCTE~?DvxP=-)6LjF2W?=azXu?^TsDhCKbUcbg$lZ
z>P&z9VUoIMJTOH(tW>kba{1|8cXx|JhEjgpad8-3HAjb*YbcwYrhZF?7xUij1s#5+
zjmL3pvIo2gYl!5Af=e4Sr)g-B{hmrTF}1=znh_fLIJq2#WSuYaRT?s0mvoY1F)7mR
z@uV6M@}afoWetl%tu2tfP|-!V23X9?k1skuQL2~ik{};S3iu5xQ$CowM=le(Jr86A
z;W{dMu`v!s%v5yG#0s>G*_%&|jH3irt2Ctpc)UYWS_IuuBnK<ulmGalC^z(3__>K{
zvpO&4N=3$vcjYIX6}FQKS0O+PNtc98=!NW0+AQVE+>C5s3v)3R@VnQ|(JLtrZ`2)h
zP1U?n%e@X!oU^W&%Y*D2Pd8DmDIDn8&b5K7hk%$$Wdkh7C!K0abBhTBACnzTMa(gV
zp*~;m4{7f@_BQhLMBc={y$(`0%V_d^QV<a14F+q2{iblWY26y+D*Ysdo6;w_8?mfw
zNzZ0|GfrB3N*!y=o}yOBeqOKd*sHP25KBjQ=b)?2HLld(Nx0^@KFE>XJEjdF41&?|
zu!1;+t=AEk?S!HgicIgsF=u^4R3y~M6$Q(U*N%6Z#V(r`_l3!*F*58YUTEEsI&TEB
ziubbjG1=%m7o@+dM@vBNl+h<fV)DIg4Hk~mYfJDUp1<_j^PxbrkQ6T18XvOXSx{GX
z=*+O0yu8;Y)ZvGwi*dzp-<dVI5-s}$G1yf6dG2afrW*`5Ca`D4&Rrhd?lfBD-kvxa
z%tJe@>NLSF+Z-wNYxcb~bX6xoN5!VyGa-N@N-p=BBPJPQ=9R@)v6)YTB9B}SJkq<!
zjlD79;WLm1D)MWjK2MnP>*TF`{;ju|J<e7>nr$&v+WbpE_NwY@zps+buFoqANwmh+
zywS`pwDX*T>uEw^k(&O%y|oL_nW|`H&iH#)>2pGRvu5eD72X8vhyl^y=GHh2SlKdd
zYx-;GiSCF;+ov0@SB8DHZO_>Qy{vXu1vIiTa7Sv0@<S?XoM^>;9rQBMWWX*cfM;l6
zia8s>Zvb=?=QwTy#cSVZ5<d_Gf|k#@=6(il8$+tUMIqzdZ!7j9CkD52g~uB|+wi2%
gJUB3SY;9|o-$&^`<G;ILb{a{0YbUFE3%``V05m7xf&c&j

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_outline_black_24dp.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_outline_black_24dp.png
deleted file mode 100644
index b706f0d06a9a1e5e2f6606c01e84094ee6a99b42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 640
zcmV-`0)PF9P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0006<Nkl<ZcmeH|
z&q^Cn6vlsvlZde!NtjSu`vyf3BJn|lX3>o#<ONz1^8nhqwMf8rtJpv`Md(`;gR817
ziruJbp-S^-Gu<2x$joJC?$CnZ?=H`G&v$d~{W3goFG#aYi!Mj>88fEO5na|OlO{3G
z*yIPEVO{WsIjnKnVT>2DMzkql!ApMPMO=L<#3I9oI}LubOO+CNvScYxqQ)LKcQkDr
zB9h}Xp02N~GG)+JIYyNnkc)PDZO<QG;e@Cg3{VRkLV2(9W1bU*c}~$mg<h>nzu*#;
zB8R%~1(<R9rKfj^Ls5UlHF=Ee=<EZBqo)jFfuU5ljj7dGy@uEZ(A4NXA&^adn2wb}
zh7+l85I|c0b5_C10BTY{Cxwq?P3;u6Omiz;mhjP%(k@BZmo80wbfr`!33chx!N-x5
zN+h8yU3&QFODPZ5mkh2buJ9olAe+cwQnT>i4Rl0>e>Eb#WLtxfOV(#vvo;8MrfX8#
zOJwj-6b<u_yCG+7@Q7RUpwnDvmMsl*Kxd=~;H`emGFApzzDa$ZK;|?H4J(6|RENxB
zpe>RC^RW#U^^>`Uk%GqUlp=9>%y-#&$qZ(w=qV2=#%SNueJg~}R_Q4VL}5`+@9~aM
z91c`Iph*TZkfp^?^`Dp^0y)$Ij}vN48)8+LhbiruA|j3sO47|fb;`I*GKou>Ivq)^
z4u=V1QQ;ad;<{u73-W9;3T-}Qiy5qW$_D4g=4Y%kOJdS2(WFC<D@KgCqDO}YB~si2
a9{39-;{s}$p1&6W0000<MNUMnLSTYm?ipPG

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_normal.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a04d4eaadbfc633819570a81d98f5f0c9366bb1
GIT binary patch
literal 4256
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

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_pressed.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..faaef0625d15ae837e23c270ce22d7d1b6ccdd48
GIT binary patch
literal 4240
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

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_outline_black_24dp.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_outline_black_24dp.png
deleted file mode 100644
index 3847a9fe74774d3593dd694cff48ccca13cdec5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 940
zcmV;d15^BoP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000AXNkl<ZcmeI$
zUuzUs7{~E%i0)QrCy}t*6>mdcfcOtJM6uO{+z8D@UxkKMBq1+Buz@6?P#P0jG1VJo
zr4$sRhK5k2Z=fXRN~6nW@y^{1KD~XI=}gYdoFjX&pWp3sm><rZJ;%_~wR(CyD$KCV
z2HP}f)26{T8!R)!6%O+imASzhZ6qcwUQ^{;oV&;~_7KB#s4<2!m-q`wku@%0-7$Vg
zGUNeAvFJxWAsN$T0xR;|i+IEi51FLGFhk_XF~l$xCRyP_#EN-xWHi7k5=w)4P7&uc
z3+y7HJf}bgCH_GIc}Eow6CO8tj|B3D5-AOY>a@9yM-m0@&<R!YNg*G4S^sjJG)}OI
z=<tFZiQPqXc#2P2gFHiYm`lFVMTej1CyN6tB0Bs)0>}6isAEB(Qj;>qRst`p9~=6q
zAu7LO=u+TQ_K7Dd@dg8*_ZUX>5!&WBSSti4^<9Bi7`TY2+y<+KU=~psWnX%OzQeO#
z$Y%%reeR=-{wJ-1^+Iq9eT6F#>jwG=^_&zcppV__#9BjN7F^M%z)NCy=&SoFTsf<r
z@|i<Ks-Ul5?(|VtPr6K`88!A0mmaAnO%rKZjZNZGRXyoGkv7y=1((Lvlh%o}t;U8i
zB`T&y)S4|KHPqOU(?UhHrcNZi>2ppC<<**2_ZI5@SJo9Db@pv9Dwel>@Q2Y|A^pR+
zXm)h0I4$&8t(hXy6*cz3S)t(J`aO{jqc{F(SB1>4AMjd@E;uWs|KhZ2{;};ky2AQ2
z)rxDxD$`NJH=PukQuA$!?4zc}-&3$&Xn>Du{t5dULsafqFEod!oWp?rpGSuiRtueB
z&+LQNE+8tK3|cF6gtuz;3+FNP08y#Yj|~U-15sJR*io8@$}eQs#}cB_phN-_NT5>I
zKj|$a=v*bC1q7WMgQRsN@Unzi63g)%L1&Ybq;ZC~2s(dqkQ990An0_M#V3gY=Ga5f
z`5TXvN})=^4!0;^!e^R~NT^Pc418W7q3m*(v-A<Ak8|A9J5{|bkBoB6BmbK^kEk-v
z2u1SbDKf%1RUT81Sn(4Fv0{QIk}(agVo{mjGL-qk5+$q~;}w!3tBm5zC{O7ihH3MJ
z^Eg-HIxlG<G5O3Y*C_H89pW<6+-IFF>a=K4XNz?fnc_RXp{J*(OZ^8ac7(2N>$@cY
O0000<MNUMnLSTaLVzg%f

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_normal.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcee96deaa1dc0ff9840aafe0388056691704969
GIT binary patch
literal 730
zcmV<00ww*4P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-w6f`8x~VPzE}VN048Zv
zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj27Z*CxAAWdOomE>Pr0006tNkl<Z
zc-rlq%UQ!P5QM$@+yN&lprAk}fhuT)hEf5S<jl$9lyf9U){eCQ+`&6D+J|gMUKRiV
z00000Ks1<ga4+9KxyApvo==7W9R(lB5Q`$Zsu>nlcoicoy71mc7~=byU<mJPgdx7K
z35M{#Mwq(z&k|RPrHcVA2p_fD6k{_bg1x2>r8rH2l-DLmA!hR=qH<5hGk%LMzBi9`
z_N{(xT)oHVt|OlEeR(flhWNhxQslCu5VIY<Iz|+~Cs!Ly{72XKxaKq0PYY;<oa+au
zG}7u<?+0d9-Mo`$z%=Cw17^FwuhO^^tKXL!P1qT!WlGJw`fE9sYPM1a2FL(b|8ZRD
z0qPmR_<8I&n$%J<S{b4Q&C-Mc1`LVe_5mKx1IPeM5WoNo02qJ)00S@pU;qYy5|q5C
zg#j~UK*WbOtvEk4AmYQ8R=9n>TbB#~0!=tl8EVOu3>YB;TE7hzVfB}4Mh48b5t}&+
zD!5&m8^AbPj_djK=Gug3%z{!*dE0&uD?v3`Fp~*2Ty9?<uZ*Ei$lLZ;`#1bh+nKAW
z1{Oj5ZY5~Meozzho*!sGodJ7<<+z&02Fz$eZ$7IR!C8(hbH5d_S4gG4P#ep==1Uyf
z*FsQ^trSUP4sI2xr5s%>)X+G*JJ9CKBP;oUgL7Zv6DH0>0Uz;k9*fhg#A?xUb0wPr
zirJ8JUd$}chujp5xUY6k;bjcyWrmXIvIZPw2(Q!t00000005Nm4{Jegp7QBMr~m)}
M07*qoM6N<$g0ufBqyPW_

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_pressed.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..781263f760abe2339a8df4f9aba5d04fa5b9eed1
GIT binary patch
literal 836
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP~CmS!L`er`8KA@0VW=KSdbAE1aYF-JD%fR4Vl$uzQ
znxasiS(2gP?&%w#ke{cJsNkEJJoQO@Gy?<Ed`}n0kcwMxW37vB8;BfndKJ9l6sL_{
zyZTOsw@R+BDsrZm_$|C->6j(kYsC~VmFm{(&cgY?_QBh4X7}Ii<9G0M;9zkS0HX?K
z9rkjId3HsA=4Z;>%W!Z#7;VH7=kmYjw+Y{RJ>CG3dm*6*c7M3#*6`@{EC#Oi*(@6S
z)^RTQu*>bht{>5z(OpZs7%e%bpEB#-cu?qI)M|e3!b41&YkeoQ&RFPq<dn7K*&h#M
zYjWj&-`oCcW#QF0yTxhOBI@+lALSN_pC13^PMOXT8SixW?nmo8{}$N%U3sZ#%hCN`
zYkJe;)W4YU=|78_Al}g-lIs{3bv{auL8Y|9{cMBf6k(nhZ~yL_s+yDX?RC*(fiSl-
zkwLcU^;*Z5&U$;3O=<;0TD|4EIgHn|8&03!boye(T9v(96}K&jYcp_Up5;>fyW#N1
zFW=qr|DEJg$Y9__#SLsODwh}@bIv=;&@X>W=gFVc&5UyPIVW2`|9;HBO+nxJMzHj$
zlT$@6II%wYXEvk#P5dfJ?FHL=BhH6TIPf;QjCqGlY+t6#yO8#R{?H9mCZG8nu!dFj
zU(V;lvwtYI6#V=9W$Nhw)e|=L{(q&Xoa?xj?w+}BgVYT6kE^#X5PR<Ebw;TuzE*z1
zs|s(mCC94j>T4o?uX&}O7Mbt9_2-+d9A!l*H`D%_op0Fc6qV(<a$^UF6UXjMnR(mo
zW*-k*=X2*ua%PwG1m)GzmODf(^Y1>mc(m)0xS>LMy?IH6xz`=@!;fE!9@WosP<LDK
zMb~@JA(y~ES!^b0ELrz-!@hoIIK5s`Z?^W8eK*ejb<I-}Vr+?#UY*8s!Q|1WtsglO
zt_j`iVcdG=$NeORH_Hltq^3QHnAbLwr}10sTv&n<xc-AZ^-O`;(G?}2e8S-A>gTe~
HDWM4f2pMO@

literal 0
HcmV?d00001

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_outline_black_24dp.png b/android/java/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_outline_black_24dp.png
deleted file mode 100644
index c1e2a03a4bc540419ce1165d5dedd8d5345fdec2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1256
zcmV<E1Q+{>P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000E9Nkl<ZcmeI&
z%}-QU7{~FiOk$iF22A8d5@W;;R&=9rXJX@~RYQHvL=BB5{Rey@gNmXiZZ*0iAP8ww
zBPF<Xfo~f_O4BU~Z2>W$LQv#I8j8T_{yf~=m$~;IXzu5?eh%l+bI*O5LnIQ3L?S-g
zNEKIT<0XBJGshx}%rQ<MFKFcoRg|(K<&&X>L6n2^)65BytPpur(aAq3mzkx5L*!vp
z0a@Ola>x)hq%a~$J)clM<Rf(?2-z9lqI}FS)r4j%&rt!Si!FrUM`lm~Wr{NdD$dUi
z7DESh9Ag({#EB6jP8qv7&Q&@Xv8``m9Rb<MA1KQ#@rv`Lu~WfCx=~o?H%bV=Hmo<y
zPuwPr8x`DP%5uCxzQSia8MXLh6V#EyivsGIv>5drmH23z#q<|xU<0`*qKPGo7Si~n
z%wqBU&0hSlj{%E?RDuuU7MJcXB=Jj%b`&x_e(Xp;ExUAT@Y|(jm(qjWZ(B;_Uor&Y
z6!R#Nv*chaGsx+GPf(5^TbQOC&z>U}Plh0!MlPf-JUW9CsUc{WQ6klNkmN0L=W$Hb
zI`=E``6_{H*O2>uGL!}iknh%)aH)U^vHJHyC=I|j;!5~HKCWcN1R5Z;2B2BgU%-W!
zczBp#L#PcDi)Yo><l$HqN=qGt+5p@XBOJi7PVu~-3cZ0s@qh3Lhw{Z|s@o8H18`Rx
z;WG&w$%vQ5G$w3EX*r4`En3+tOzF{P(ufn{HgX;_<YxXS4s1keNn^?mF_&WZTj($*
zz1L=Q5L;KYk`By~8+t9a+T<<FpzGRfnz8j#D>;Taa!Y@Ptv;<}7l4r)8NeQGlwNF&
zYb9ky8`z|cGKQ@=tt4)=frR*F&DNq;5;NLBOdDlk)i<!(mQYeIq5t_sEVt3!t8E*7
zp_Lpr*nqr|J;he5R&v#712?o$?t6HcGupsoZIrD0$LSHH4UD?~GEs`sQemutonBsO
zpkFJxXsm%+@k;6GvtGBc27dSUdGmz$tWsg5fl4vPVH`;^s}<fc(!f1!gc;&E)FDoh
z6olTudhz?*LmWGV(o!FK1GmHo-{DvuLt619MWHrO%Cz|1ehn_vhzT@>+CZzQKZh$R
zK8n3)UuX^N7uDk=aj8xWGC(Sn1_~Jx)mdCiFf4{?52b-lQTv8C9#o@5E)leAD3OzR
z)Fn^Gaf%@QAdedG1kbj}b8XCXgrFSb3rcL@n*sbhFEP*Qfd2Kr_;5}_cz_aF;&K3M
ze+ebhM9$XHgOZ`06n-hB6D318Yw<w|gD4pW*oPnXGlY_%pCWvc=AFf9-DZl(MJa8l
zW%HJDd{k-Cf?|rB6yn8tZZT~!>ImEMS(?`<%O>vfHEvXL&vNpLe#!|zDLp9b&_k9T
z*x5;~c-Pf0-68_APCn*}yr+}vWZ1(d62yp+WD|SHaD&H;+SWI+mO!0l8Wm6`sU`&F
zbfE&s6E+i?YKBohW{8u7EWu?ypnS+US>hOx&jq=;y2>EuNMckT2YAG1l*`QUkZ)PT
z3X$L_jr@gjkUknXOq>;|goD)5%rkl!W0nOLm}QJ!o^qco2Ph^Ii9{k1-~0zqnGDmx
SqDLYC0000<MNUMnLSTX%6+fW>

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml b/android/java/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml
new file mode 100644
index 000000000..fdbabbae1
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+        <item android:state_pressed="true" android:drawable="@drawable/ic_info_blue_pressed" />
+        <item android:drawable="@drawable/ic_info_blue_normal" />
+</selector>
\ No newline at end of file

From 9a6924435baa3f303311de305ba280a354364bfe Mon Sep 17 00:00:00 2001
From: tobrun <tobrun.van.nuland@gmail.com>
Date: Sun, 6 Sep 2015 15:51:11 +0200
Subject: [PATCH 5/9] Added styling to the Attribution AlertDialog

---
 .../main/java/com/mapbox/mapboxgl/views/MapView.java  |  4 ++--
 .../src/main/res/layout/attribution_list_item.xml     | 11 +++++++++++
 .../MapboxGLAndroidSDK/src/main/res/values/colors.xml |  1 +
 .../MapboxGLAndroidSDK/src/main/res/values/styles.xml |  9 +++++++++
 .../src/main/res/values/colors.xml                    |  2 +-
 5 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml
 create mode 100644 android/java/MapboxGLAndroidSDK/src/main/res/values/styles.xml

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 dda11c8f5..5a07365c4 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
@@ -2045,9 +2045,9 @@ public class MapView extends FrameLayout implements LocationListener {
         public void onClick(View v) {
             Context context = v.getContext();
             String[] items = context.getResources().getStringArray(R.array.attribution_names);
-            AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.AttributionAlertDialogStyle);
             builder.setTitle(R.string.attributionsDialogTitle);
-            builder.setAdapter(new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, items), this);
+            builder.setAdapter(new ArrayAdapter<>(context, R.layout.attribution_list_item, items), this);
             builder.show();
         }
 
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml b/android/java/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml
new file mode 100644
index 000000000..f0a912158
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceListItemSmall"
+    android:textColor="@android:color/white"
+    android:gravity="center_vertical"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall" />
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/android/java/MapboxGLAndroidSDK/src/main/res/values/colors.xml
index bf3f48431..bb1c326a8 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/values/colors.xml
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/values/colors.xml
@@ -2,4 +2,5 @@
 <resources>
     <color name="white">#FFFFFF</color>
     <color name="black">#000000</color>
+    <color name="mapbox_blue">#1E8CAB</color>
 </resources>
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/styles.xml b/android/java/MapboxGLAndroidSDK/src/main/res/values/styles.xml
new file mode 100644
index 000000000..a0859a998
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/values/styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AttributionAlertDialogStyle" parent="Theme.AppCompat.Dialog.Alert">
+        <item name="android:textColorPrimary">@android:color/white</item>
+        <item name="android:background">@color/mapbox_blue</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
index ac3b4fc30..af798515f 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="primary">#1E8CAB</color>
+    <color name="primary">@color/mapbox_blue</color>
     <color name="primaryDark">#166B83</color>
     <color name="accent">#E55E5E</color>
     <color name="white">#FFFFFF</color>

From e7398c16c133e74274ffeda4b5b2994816fcf121 Mon Sep 17 00:00:00 2001
From: tobrun <tobrun.van.nuland@gmail.com>
Date: Sun, 6 Sep 2015 16:37:34 +0200
Subject: [PATCH 6/9] Added "Improve this map" functionality, current zoom
 level, center latitude and longitude will be parsed in to the url of improve
 this map.

---
 .../com/mapbox/mapboxgl/views/MapView.java    | 22 ++++++++++++++-----
 .../src/main/res/values/arrays.xml            |  2 +-
 2 files changed, 18 insertions(+), 6 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 5a07365c4..71121b7aa 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
@@ -120,6 +120,8 @@ public class MapView extends FrameLayout implements LocationListener {
     private static final float DIMENSION_SIXTEEN_DP = 16f;
     private static final float DIMENSION_TEN_DP = 10f;
 
+    private static final int IMPROVE_THIS_MAP_INDEX = 2;
+
     /**
      * Every annotation that has been added to the map.
      */
@@ -425,7 +427,7 @@ public class MapView extends FrameLayout implements LocationListener {
         LayoutParams attrParams = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         mAttributionsView.setLayoutParams(attrParams);
         addView(mAttributionsView);
-        mAttributionsView.setOnClickListener(new AttributionOnClickListener());
+        mAttributionsView.setOnClickListener(new AttributionOnClickListener(this));
 
         // Setup Support For Listener Tracking
         // MapView's internal listener is setup in onCreate()
@@ -2040,6 +2042,12 @@ public class MapView extends FrameLayout implements LocationListener {
 
     private static class AttributionOnClickListener implements View.OnClickListener, DialogInterface.OnClickListener {
 
+        private MapView mMapView;
+
+        public AttributionOnClickListener(MapView mapView) {
+            mMapView = mapView;
+        }
+
         // Called when someone presses the attribution icon
         @Override
         public void onClick(View v) {
@@ -2051,13 +2059,17 @@ public class MapView extends FrameLayout implements LocationListener {
             builder.show();
         }
 
-        // Called when someone selects an attribution
+        // Called when someone selects an attribution, 'Improve this map' adds location data to the url
         @Override
         public void onClick(DialogInterface dialog, int which) {
-            Context context = ((Dialog)dialog).getContext();
-            String[]links = context.getResources().getStringArray(R.array.attribution_links);
+            Context context = ((Dialog) dialog).getContext();
+            String url = context.getResources().getStringArray(R.array.attribution_links)[which];
+            if (which == IMPROVE_THIS_MAP_INDEX) {
+                LatLng latLng = mMapView.getCenterCoordinate();
+                url = String.format(url, latLng.getLongitude(), latLng.getLatitude(), (int) mMapView.getZoomLevel());
+            }
             Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.setData(Uri.parse(links[which]));
+            intent.setData(Uri.parse(url));
             context.startActivity(intent);
         }
     }
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/arrays.xml b/android/java/MapboxGLAndroidSDK/src/main/res/values/arrays.xml
index 3e937722c..8a8e204b7 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/values/arrays.xml
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/values/arrays.xml
@@ -8,6 +8,6 @@
     <array name="attribution_links" formatted="false" translatable="false">
         <item>https://www.mapbox.com/about/maps/</item>
         <item>http://www.openstreetmap.org/about/</item>
-        <item>https://www.mapbox.com/map-feedback</item>
+        <item>https://www.mapbox.com/map-feedback/#/%1$f/%2$f/%3$d</item>
     </array>
 </resources>
\ No newline at end of file

From 36a754a1fe20afeedd931d2b8dcd68d4ff16191f Mon Sep 17 00:00:00 2001
From: tobrun <tobrun.van.nuland@gmail.com>
Date: Sun, 6 Sep 2015 19:20:05 +0200
Subject: [PATCH 7/9] Using AlertDialog from AppCompat instead of SDKs version

---
 .../src/main/java/com/mapbox/mapboxgl/views/MapView.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 71121b7aa..b78db1736 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
@@ -1,7 +1,6 @@
 package com.mapbox.mapboxgl.views;
 
 import android.app.ActivityManager;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -30,6 +29,7 @@ import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.GestureDetectorCompat;
 import android.support.v4.view.ScaleGestureDetectorCompat;
+import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.GestureDetector;
 import android.view.Gravity;

From 290a857b511f6500c8d376af78f5492c274c9bef Mon Sep 17 00:00:00 2001
From: tobrun <tobrun.van.nuland@gmail.com>
Date: Wed, 9 Sep 2015 18:40:27 +0200
Subject: [PATCH 8/9] Moved icon to the right of Mapbox logo

---
 .../com/mapbox/mapboxgl/views/MapView.java    | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 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 b78db1736..d50fac6ee 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
@@ -117,10 +117,12 @@ public class MapView extends FrameLayout implements LocationListener {
     private static final String STATE_ATTRIBUTION_MARGIN_BOTTOM = "atrrMarginBottom";
 
     // Used for positioning views
-    private static final float DIMENSION_SIXTEEN_DP = 16f;
+    private static final float DIMENSION_SEVEN_DP = 7f;
     private static final float DIMENSION_TEN_DP = 10f;
+    private static final float DIMENSION_SIXTEEN_DP = 16f;
+    private static final float DIMENSION_SEVENTYSIX_DP = 76f;
 
-    private static final int IMPROVE_THIS_MAP_INDEX = 2;
+    private static final int ATTRIBUTION_INDEX_IMPROVE_THIS_MAP = 2;
 
     /**
      * Every annotation that has been added to the map.
@@ -422,7 +424,11 @@ public class MapView extends FrameLayout implements LocationListener {
 
         // Setup Attributions control
         mAttributionsView = new ImageView(mContext);
-        mAttributionsView.setBackgroundResource(R.drawable.ic_info_selector);
+        mAttributionsView.setClickable(true);
+        mAttributionsView.setImageResource(R.drawable.ic_info_selector);
+        int attrPadding = (int) (DIMENSION_SEVEN_DP * mScreenDensity);
+        mAttributionsView.setPadding(attrPadding, attrPadding, attrPadding, attrPadding);
+        mAttributionsView.setAdjustViewBounds(true);
         mAttributionsView.setContentDescription(getResources().getString(R.string.attributionsIconContentDescription));
         LayoutParams attrParams = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         mAttributionsView.setLayoutParams(attrParams);
@@ -478,11 +484,11 @@ public class MapView extends FrameLayout implements LocationListener {
                     , typedArray.getDimension(R.styleable.MapView_logoMarginBottom, DIMENSION_SIXTEEN_DP));
 
             // Attribution
-            setAttributionGravity(typedArray.getInt(R.styleable.MapView_attributionGravity, Gravity.BOTTOM | Gravity.END));
-            setWidgetMargins(mAttributionsView, typedArray.getDimension(R.styleable.MapView_attributionMarginLeft, DIMENSION_SIXTEEN_DP)
-                    , typedArray.getDimension(R.styleable.MapView_attributionMarginTop, DIMENSION_SIXTEEN_DP)
-                    , typedArray.getDimension(R.styleable.MapView_attributionMarginRight, DIMENSION_SIXTEEN_DP)
-                    , typedArray.getDimension(R.styleable.MapView_attributionMarginBottom, DIMENSION_SIXTEEN_DP));
+            setAttributionGravity(typedArray.getInt(R.styleable.MapView_attributionGravity, Gravity.BOTTOM));
+            setWidgetMargins(mAttributionsView, typedArray.getDimension(R.styleable.MapView_attributionMarginLeft, DIMENSION_SEVENTYSIX_DP)
+                    , typedArray.getDimension(R.styleable.MapView_attributionMarginTop, DIMENSION_SEVEN_DP)
+                    , typedArray.getDimension(R.styleable.MapView_attributionMarginRight, DIMENSION_SEVEN_DP)
+                    , typedArray.getDimension(R.styleable.MapView_attributionMarginBottom, DIMENSION_SEVEN_DP));
 
             setMyLocationEnabled(typedArray.getBoolean(R.styleable.MapView_myLocationEnabled, false));
         } finally {
@@ -2064,7 +2070,7 @@ public class MapView extends FrameLayout implements LocationListener {
         public void onClick(DialogInterface dialog, int which) {
             Context context = ((Dialog) dialog).getContext();
             String url = context.getResources().getStringArray(R.array.attribution_links)[which];
-            if (which == IMPROVE_THIS_MAP_INDEX) {
+            if (which == ATTRIBUTION_INDEX_IMPROVE_THIS_MAP) {
                 LatLng latLng = mMapView.getCenterCoordinate();
                 url = String.format(url, latLng.getLongitude(), latLng.getLatitude(), (int) mMapView.getZoomLevel());
             }

From d371dd07cbe7093996ba2bf16dd5c33d4037e9f7 Mon Sep 17 00:00:00 2001
From: tobrun <tobrun.van.nuland@gmail.com>
Date: Wed, 9 Sep 2015 18:55:17 +0200
Subject: [PATCH 9/9] Changed title dialog

---
 .../java/MapboxGLAndroidSDK/src/main/res/values/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDK/src/main/res/values/strings.xml
index 455fdb026..be9a1d38c 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/values/strings.xml
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/values/strings.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="compassContentDescription">Map compass. Click to reset the map rotation to North.</string>
+    <string name="attributionsIconContentDescription">Attribution icon. Click to show attribution dialog.</string>
+    <string name="attributionsDialogTitle">Mapbox Android SDK</string>
+    <string name="mapboxIconContentDescription">Mapbox logo.</string>
     <string name="infoWindowTitle">Title</string>
     <string name="infoWindowDescription">Description</string>
     <string name="infoWindowAddress">Address</string>
-    <string name="attributionsIconContentDescription">Attribution icon. Click to show attribution dialog.</string>
-    <string name="attributionsDialogTitle">Mapbox for Android</string>
-    <string name="mapboxIconContentDescription">Mapbox logo.</string>
 </resources>