summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2016-11-02 12:41:22 +0100
committerGitHub <noreply@github.com>2016-11-02 12:41:22 +0100
commit4d0c42e36ae384102b624476e3d04c94a02190c7 (patch)
treee786a18445ee47f479e73eb47fa2d87631fa4e10 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera
parent9ad5dd15857e7d15810877e2173839f45cc5e343 (diff)
downloadqtlocation-mapboxgl-4d0c42e36ae384102b624476e3d04c94a02190c7.tar.gz
Prefix library resources to avoid naming conflicts (#6878)
* [android] - add library resource prefix * update SDK resources with prefix * fixup tests
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
index 3888abc041..11296b7875 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
@@ -154,12 +154,12 @@ public final class CameraPosition implements Parcelable {
public Builder(TypedArray typedArray) {
super();
if (typedArray != null) {
- this.bearing = typedArray.getFloat(R.styleable.MapView_direction, 0.0f);
- double lat = typedArray.getFloat(R.styleable.MapView_center_latitude, 0.0f);
- double lng = typedArray.getFloat(R.styleable.MapView_center_longitude, 0.0f);
+ this.bearing = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_direction, 0.0f);
+ double lat = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_center_latitude, 0.0f);
+ double lng = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_center_longitude, 0.0f);
this.target = new LatLng(lat, lng);
- this.tilt = typedArray.getFloat(R.styleable.MapView_tilt, 0.0f);
- this.zoom = typedArray.getFloat(R.styleable.MapView_zoom, 0.0f);
+ this.tilt = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_tilt, 0.0f);
+ this.zoom = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_zoom, 0.0f);
}
}