diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-11-02 12:41:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-02 12:41:22 +0100 |
| commit | 4d0c42e36ae384102b624476e3d04c94a02190c7 (patch) | |
| tree | e786a18445ee47f479e73eb47fa2d87631fa4e10 /platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation | |
| parent | 9ad5dd15857e7d15810877e2173839f45cc5e343 (diff) | |
| download | qtlocation-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/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java index 77cba30372..0c77b60d9a 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java @@ -78,7 +78,7 @@ public class MyLocationTintActivity extends AppCompatActivity implements Locatio @Override public void onClick(View view) { myLocationViewSettings.setAccuracyTintColor(ContextCompat.getColor( - MyLocationTintActivity.this, R.color.my_location_ring)); + MyLocationTintActivity.this, R.color.mapbox_my_location_ring)); myLocationViewSettings.setForegroundTintColor(ContextCompat.getColor( MyLocationTintActivity.this, R.color.mapbox_blue)); } |