diff options
author | Brad Leege <bleege@gmail.com> | 2015-10-30 09:05:04 -0500 |
---|---|---|
committer | Brad Leege <bleege@gmail.com> | 2015-10-30 09:05:04 -0500 |
commit | 25c8eeecf9245cbabdc592c959a56a7c50451315 (patch) | |
tree | 0e8e8bdfc28c0504acf5adb83b5e2db2cbbafb57 /android | |
parent | 90b1469a77b0161cc263138368a8b20726468b6c (diff) | |
parent | 6f7c53900d998baba5cabf91b3b333ccba7ef099 (diff) | |
download | qtlocation-mapboxgl-25c8eeecf9245cbabdc592c959a56a7c50451315.tar.gz |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native
Diffstat (limited to 'android')
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java | 8 | ||||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java | 61 | ||||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml | 12 | ||||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_normal.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_normal.png) | bin | 2194 -> 2194 bytes | |||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_pressed.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_pressed.png) | bin | 2133 -> 2133 bytes | |||
-rwxr-xr-x | android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location.png) | bin | 2783 -> 2783 bytes | |||
-rwxr-xr-x | android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_bearing.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_bearing.png) | bin | 5939 -> 5939 bytes | |||
-rwxr-xr-x | android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_stale.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_stale.png) | bin | 2593 -> 2593 bytes | |||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_normal.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_normal.png) | bin | 1354 -> 1354 bytes | |||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_pressed.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_pressed.png) | bin | 1391 -> 1391 bytes | |||
-rwxr-xr-x | android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location.png) | bin | 2089 -> 2089 bytes | |||
-rwxr-xr-x | android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_bearing.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_bearing.png) | bin | 3599 -> 3599 bytes | |||
-rwxr-xr-x | android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_stale.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_stale.png) | bin | 1942 -> 1942 bytes | |||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_normal.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_normal.png) | bin | 2710 -> 2710 bytes | |||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_pressed.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_pressed.png) | bin | 2738 -> 2738 bytes | |||
-rwxr-xr-x | android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location.png) | bin | 3520 -> 3520 bytes | |||
-rwxr-xr-x | android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_bearing.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_bearing.png) | bin | 8155 -> 8155 bytes | |||
-rwxr-xr-x | android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_stale.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_stale.png) | bin | 3287 -> 3287 bytes | |||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_normal.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_normal.png) | bin | 4256 -> 4256 bytes | |||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_pressed.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_pressed.png) | bin | 4240 -> 4240 bytes | |||
-rwxr-xr-x | android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location.png) | bin | 5057 -> 5057 bytes | |||
-rwxr-xr-x | android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_bearing.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_bearing.png) | bin | 13246 -> 13246 bytes | |||
-rwxr-xr-x | android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_stale.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_stale.png) | bin | 4676 -> 4676 bytes | |||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_normal.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_normal.png) | bin | 730 -> 730 bytes | |||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_pressed.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_pressed.png) | bin | 836 -> 836 bytes | |||
-rwxr-xr-x | android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location.png) | bin | 5236 -> 5236 bytes | |||
-rwxr-xr-x | android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_bearing.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_bearing.png) | bin | 11688 -> 11688 bytes | |||
-rwxr-xr-x | android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_stale.png (renamed from android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_stale.png) | bin | 5053 -> 5053 bytes | |||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res/drawable/attribution_button_selector.xml | 5 | ||||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml | 5 | ||||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml | 2 | ||||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res/values/colors.xml | 1 |
32 files changed, 41 insertions, 53 deletions
diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java index 2b6a3071ec..13482c1ca2 100644 --- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java +++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java @@ -2306,7 +2306,13 @@ public final class MapView extends FrameLayout { // Single finger double tap // Zoom in - zoom(true, e.getX(), e.getY()); + if (mUserLocationView.getMyLocationTrackingMode() == MyLocationTracking.TRACKING_NONE) { + // Zoom in on gesture + zoom(true, e.getX(), e.getY()); + } else { + // Zoom in on center map + zoom(true, getWidth() / 2, getHeight() / 2); + } return true; } diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java index 349765bdd3..db5b320ba6 100644 --- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java +++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java @@ -37,14 +37,10 @@ import com.mapzen.android.lost.api.LocationRequest; import com.mapzen.android.lost.api.LocationServices; import com.mapzen.android.lost.api.LostApiClient; -import java.util.ArrayDeque; - final class UserLocationView extends View { private MapView mMapView; - private static final int BLUE_COLOR = 0x39ACCBFF; - private float mDensity; private boolean mShowMarker; @@ -137,6 +133,8 @@ final class UserLocationView extends View { // Setup the custom paint Resources resources = context.getResources(); + int accuracyColor = resources.getColor(R.color.my_location_ring); + mDensity = resources.getDisplayMetrics().density; mMarkerCoordinate = new LatLng(0.0, 0.0); mMarkerScreenPoint = new PointF(); @@ -145,20 +143,20 @@ final class UserLocationView extends View { mAccuracyPaintFill = new Paint(); mAccuracyPaintFill.setAntiAlias(true); mAccuracyPaintFill.setStyle(Paint.Style.FILL); - mAccuracyPaintFill.setColor(BLUE_COLOR); + mAccuracyPaintFill.setColor(accuracyColor); mAccuracyPaintFill.setAlpha((int) (255 * 0.25f)); mAccuracyPaintStroke = new Paint(); mAccuracyPaintStroke.setAntiAlias(true); mAccuracyPaintStroke.setStyle(Paint.Style.STROKE); mAccuracyPaintStroke.setStrokeWidth(0.5f * mDensity); - mAccuracyPaintStroke.setColor(BLUE_COLOR); + mAccuracyPaintStroke.setColor(accuracyColor); mAccuracyPaintStroke.setAlpha((int) (255 * 0.5f)); mAccuracyPath = new Path(); mAccuracyBounds = new RectF(); - mUserLocationDrawable = ContextCompat.getDrawable(getContext(), R.drawable.user_location); + mUserLocationDrawable = ContextCompat.getDrawable(getContext(), R.drawable.my_location); mUserLocationDrawableBounds = new Rect( -mUserLocationDrawable.getIntrinsicWidth() / 2, -mUserLocationDrawable.getIntrinsicHeight() / 2, @@ -171,7 +169,7 @@ final class UserLocationView extends View { mUserLocationDrawable.getIntrinsicHeight() / 2); mUserLocationDrawable.setBounds(mUserLocationDrawableBounds); - mUserLocationBearingDrawable = ContextCompat.getDrawable(getContext(), R.drawable.user_location_bearing); + mUserLocationBearingDrawable = ContextCompat.getDrawable(getContext(), R.drawable.my_location_bearing); mUserLocationBearingDrawableBounds = new Rect( -mUserLocationBearingDrawable.getIntrinsicWidth() / 2, -mUserLocationBearingDrawable.getIntrinsicHeight() / 2, @@ -184,7 +182,7 @@ final class UserLocationView extends View { mUserLocationBearingDrawable.getIntrinsicHeight() / 2); mUserLocationBearingDrawable.setBounds(mUserLocationBearingDrawableBounds); - mUserLocationStaleDrawable = ContextCompat.getDrawable(getContext(), R.drawable.user_location_stale); + mUserLocationStaleDrawable = ContextCompat.getDrawable(getContext(), R.drawable.my_location_stale); mUserLocationStaleDrawableBounds = new Rect( -mUserLocationStaleDrawable.getIntrinsicWidth() / 2, -mUserLocationStaleDrawable.getIntrinsicHeight() / 2, @@ -382,8 +380,7 @@ final class UserLocationView extends View { private GeomagneticField mGeomagneticField; // Controls the sensor update rate in milliseconds - private static final int UPDATE_RATE_MS = 500; - private AngleLowPassFilter mLowPassFilter; + private static final int UPDATE_RATE_MS = 300; // Compass data private float mCompassBearing; @@ -392,12 +389,11 @@ final class UserLocationView extends View { public MyBearingListener(Context context) { mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE); mSensorRotationVector = mSensorManager.getDefaultSensor(Sensor.TYPE_ROTATION_VECTOR); - mLowPassFilter = new AngleLowPassFilter(); } public void onStart(Context context) { mRotationDevice = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); - mSensorManager.registerListener(this, mSensorRotationVector, UPDATE_RATE_MS * 1000); + mSensorManager.registerListener(this, mSensorRotationVector, UPDATE_RATE_MS * 2500); } public void onStop() { @@ -414,6 +410,11 @@ final class UserLocationView extends View { return; } + long currentTime = SystemClock.elapsedRealtime(); + if (currentTime < mCompassUpdateNextTimestamp) { + return; + } + switch (event.sensor.getType()) { case Sensor.TYPE_ROTATION_VECTOR: SensorManager.getRotationMatrixFromVector(mRotationMatrix, event.values); @@ -432,19 +433,13 @@ final class UserLocationView extends View { break; } - mLowPassFilter.add(mOrientation[0]); - long currentTime = System.currentTimeMillis(); - if (currentTime < mCompassUpdateNextTimestamp) { - return; - } - mCompassUpdateNextTimestamp = currentTime + UPDATE_RATE_MS; mGeomagneticField = new GeomagneticField( (float) mUserLocation.getLatitude(), (float) mUserLocation.getLongitude(), (float) mUserLocation.getAltitude(), currentTime); - mCompassBearing = (float) Math.toDegrees(mLowPassFilter.average()) + mGeomagneticField.getDeclination(); + mCompassBearing = (float) Math.toDegrees(mOrientation[0] + mGeomagneticField.getDeclination()); setCompass(mCompassBearing); } @@ -452,32 +447,6 @@ final class UserLocationView extends View { public void onAccuracyChanged(Sensor sensor, int accuracy) { // TODO add accuracy to the equiation } - - private class AngleLowPassFilter { - - private final int LENGTH = 5; - - private float sumSin, sumCos; - - private ArrayDeque<Float> queue = new ArrayDeque<>(); - - public void add(float radians) { - sumSin += (float) Math.sin(radians); - sumCos += (float) Math.cos(radians); - queue.add(radians); - - if (queue.size() > LENGTH) { - float old = queue.poll(); - sumSin -= Math.sin(old); - sumCos -= Math.cos(old); - } - } - - public float average() { - int size = queue.size(); - return (float) Math.atan2(sumSin / size, sumCos / size); - } - } } diff --git a/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml index 09dee3752a..66149ffcb6 100644 --- a/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml +++ b/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml @@ -40,4 +40,16 @@ <public name="attribution_margin_right" type="attr" /> <public name="attribution_margin_bottom" type="attr" /> <public name="attribution_visibility" type="attr" /> + + <public name="attribution_logo" type="drawable" /> + <public name="compass" type="drawable" /> + <public name="default_marker" type="drawable" /> + <public name="attribution_button_pressed_selector" type="drawable" /> + <public name="attribution_button_pressed_normal" type="drawable" /> + <public name="attribution_button_pressed_pressed" type="drawable" /> + <public name="my_location" type="drawable" /> + <public name="my_location_bearing" type="drawable" /> + <public name="my_location_stale" type="drawable" /> + <public name="my_location_ring" type="color" /> + <public name="mapbox_blue" type="color" /> </resources> diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_normal.png Binary files differindex de44e3ddc0..de44e3ddc0 100644 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_normal.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_normal.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_pressed.png Binary files differindex fa26786242..fa26786242 100644 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_pressed.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_pressed.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location.png Binary files differindex 1ae8d541af..1ae8d541af 100755 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_bearing.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_bearing.png Binary files differindex 8ecaffa2e8..8ecaffa2e8 100755 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_bearing.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_bearing.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_stale.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_stale.png Binary files differindex 0d599c01fa..0d599c01fa 100755 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_stale.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_stale.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_normal.png Binary files differindex dd50478ac1..dd50478ac1 100644 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_normal.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_normal.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_pressed.png Binary files differindex d377f3cb8c..d377f3cb8c 100644 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_pressed.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_pressed.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location.png Binary files differindex 542cd25e22..542cd25e22 100755 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_bearing.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_bearing.png Binary files differindex 429f03f648..429f03f648 100755 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_bearing.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_bearing.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_stale.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_stale.png Binary files differindex 6613c41153..6613c41153 100755 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_stale.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_stale.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_normal.png Binary files differindex df7d7a8875..df7d7a8875 100644 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_normal.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_normal.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_pressed.png Binary files differindex f5b1833641..f5b1833641 100644 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_pressed.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_pressed.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location.png Binary files differindex ca1f1fe630..ca1f1fe630 100755 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_bearing.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_bearing.png Binary files differindex 1b88f9f489..1b88f9f489 100755 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_bearing.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_bearing.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_stale.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_stale.png Binary files differindex 7af3789ff0..7af3789ff0 100755 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_stale.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_stale.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_normal.png Binary files differindex 0a04d4eaad..0a04d4eaad 100644 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_normal.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_normal.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_pressed.png Binary files differindex faaef0625d..faaef0625d 100644 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_pressed.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_pressed.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location.png Binary files differindex 6f175df168..6f175df168 100755 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_bearing.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_bearing.png Binary files differindex f4bb454a06..f4bb454a06 100755 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_bearing.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_bearing.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_stale.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_stale.png Binary files differindex f1d2f2eca0..f1d2f2eca0 100755 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_stale.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_stale.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_normal.png Binary files differindex bcee96deaa..bcee96deaa 100644 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_normal.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_normal.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_pressed.png Binary files differindex 781263f760..781263f760 100644 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_pressed.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_pressed.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location.png Binary files differindex d43541ac3c..d43541ac3c 100755 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_bearing.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_bearing.png Binary files differindex a8cccbb3e2..a8cccbb3e2 100755 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_bearing.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_bearing.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_stale.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_stale.png Binary files differindex 33e952391f..33e952391f 100755 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_stale.png +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_stale.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/attribution_button_selector.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/attribution_button_selector.xml new file mode 100644 index 0000000000..b5fedb0fd0 --- /dev/null +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable/attribution_button_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:drawable="@drawable/attribution_button_pressed" android:state_pressed="true" /> + <item android:drawable="@drawable/attribution_button_normal" /> +</selector>
\ No newline at end of file diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml deleted file mode 100644 index 9f550f66d5..0000000000 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/ic_info_blue_pressed" android:state_pressed="true" /> - <item android:drawable="@drawable/ic_info_blue_normal" /> -</selector>
\ No newline at end of file diff --git a/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml b/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml index c4eaecc079..92cd2315f4 100644 --- a/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml +++ b/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml @@ -26,7 +26,7 @@ android:clickable="true" android:contentDescription="@string/attributionsIconContentDescription" android:padding="7dp" - android:src="@drawable/ic_info_selector" /> + android:src="@drawable/attribution_button_selector" /> <com.mapbox.mapboxsdk.views.UserLocationView android:id="@+id/userLocationView" diff --git a/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml index bb1c326a89..55cf3fb1b6 100644 --- a/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml +++ b/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml @@ -3,4 +3,5 @@ <color name="white">#FFFFFF</color> <color name="black">#000000</color> <color name="mapbox_blue">#1E8CAB</color> + <color name="my_location_ring">@color/mapbox_blue</color> </resources> |