diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/res')
31 files changed, 31 insertions, 66 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml index 00dc67ebed..ff8070dfcd 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml @@ -12,8 +12,7 @@ android:layout_height="match_parent" app:mapbox_cameraTargetLat="52.519003" app:mapbox_cameraTargetLng="13.400972" - app:mapbox_cameraZoom="16" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> + app:mapbox_cameraZoom="16"/> <android.support.design.widget.FloatingActionButton android:id="@id/fab" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml index 26b40b9ab6..3ced7c8e2f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml @@ -11,7 +11,6 @@ android:layout_height="match_parent" app:mapbox_cameraTargetLat="41.9567" app:mapbox_cameraTargetLng="-78.6430" - app:mapbox_cameraZoom="5" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> + app:mapbox_cameraZoom="5"/> </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml index 252af714e7..a8dbefc1b2 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml @@ -12,7 +12,6 @@ android:layout_height="wrap_content" app:mapbox_cameraTargetLat="38.90962" app:mapbox_cameraTargetLng="-77.04341" - app:mapbox_cameraZoom="15" - app:mapbox_styleUrl="@string/mapbox_style_light"/> + app:mapbox_cameraZoom="15"/> </LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml index c8752df1bf..70141250d1 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml @@ -9,8 +9,7 @@ app:mapbox_cameraTargetLat="40.7135" app:mapbox_cameraTargetLng="-74.0066" app:mapbox_cameraTilt="45" - app:mapbox_cameraZoom="15" - app:mapbox_styleUrl="@string/mapbox_style_dark"/> + app:mapbox_cameraZoom="15"/> <android.support.design.widget.FloatingActionButton android:id="@+id/fabLightPosition" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animator.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animator.xml index cb14aab91f..c4c1d0e681 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animator.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animator.xml @@ -12,8 +12,7 @@ android:layout_height="match_parent" app:mapbox_cameraTargetLat="37.787947" app:mapbox_cameraTargetLng="-122.407432" - app:mapbox_cameraZoom="11" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> + app:mapbox_cameraZoom="11"/> <android.support.design.widget.FloatingActionButton android:id="@+id/fab" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml index bafafb9546..28bdaf7b2a 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml @@ -18,8 +18,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="?android:attr/actionBarSize" - app:mapbox_uiAttributionTintColor="@color/redAccent" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> + app:mapbox_uiAttributionTintColor="@color/redAccent"/> <android.support.design.widget.FloatingActionButton android:id="@+id/fab" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml index 5ac55e75e2..2bc4ff7edf 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml @@ -11,8 +11,7 @@ android:layout_height="match_parent" app:mapbox_cameraTargetLat="1.350057" app:mapbox_cameraTargetLng="103.849218" - app:mapbox_cameraZoom="10" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> + app:mapbox_cameraZoom="10"/> <android.support.design.widget.FloatingActionButton android:id="@+id/fab_route" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_espresso_test.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_espresso_test.xml index be84b7b61b..e4b66c2981 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_espresso_test.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_espresso_test.xml @@ -10,7 +10,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@id/toolbar" - app:mapbox_styleUrl="asset://streets.json" app:mapbox_cameraZoom="1"/> </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml index d9a10871b5..2f14d5b94e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml @@ -12,7 +12,6 @@ app:mapbox_cameraTargetLat="40.7135" app:mapbox_cameraTargetLng="-74.0066" app:mapbox_cameraTilt="45" - app:mapbox_cameraZoom="15" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> + app:mapbox_cameraZoom="15"/> </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml index 26b40b9ab6..3ced7c8e2f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml @@ -11,7 +11,6 @@ android:layout_height="match_parent" app:mapbox_cameraTargetLat="41.9567" app:mapbox_cameraTargetLng="-78.6430" - app:mapbox_cameraZoom="5" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> + app:mapbox_cameraZoom="5"/> </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml index a2410c547c..9f48c08097 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml @@ -11,7 +11,6 @@ android:layout_height="match_parent" app:mapbox_cameraTargetLat="52.090710" app:mapbox_cameraTargetLng="5.121125" - app:mapbox_cameraZoom="10" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> + app:mapbox_cameraZoom="10"/> </RelativeLayout>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml index 3339341f6e..ad8be71793 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml @@ -12,7 +12,6 @@ android:layout_height="match_parent" app:mapbox_cameraTargetLat="38.897705003219784" app:mapbox_cameraTargetLng="-77.03655168667463" - app:mapbox_cameraZoom="15" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> + app:mapbox_cameraZoom="15"/> </LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml index abb41c05c4..970e77114b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml @@ -12,7 +12,6 @@ android:layout_height="match_parent" app:mapbox_cameraTargetLat="47.798202" app:mapbox_cameraTargetLng="7.573781" - app:mapbox_cameraZoom="4" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> + app:mapbox_cameraZoom="4"/> </LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml index 1c59fe4ba6..856dd24752 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml @@ -12,7 +12,6 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets" app:mapbox_localIdeographFontFamily="Droid Sans" /> </LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_mode.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_mode.xml index 243792e063..e23d876e3a 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_mode.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_mode.xml @@ -14,7 +14,6 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets" app:mapbox_uiAttribution="false" /> <LinearLayout diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml index 42547f10a5..97319f7c56 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml @@ -4,7 +4,6 @@ <com.mapbox.mapboxsdk.maps.MapView android:id="@id/mapView" android:layout_width="match_parent" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets" android:layout_height="match_parent"/> <View diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_visibility.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_visibility.xml index a80b464789..fe58537813 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_visibility.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_visibility.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/viewParent" android:layout_width="match_parent" android:layout_height="match_parent" @@ -12,7 +12,6 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets" android:visibility="invisible"/> </LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml index eae79f631d..e2c07c6fd8 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml @@ -12,7 +12,6 @@ android:layout_below="@id/toolbar" app:mapbox_cameraTargetLat="38.87031" app:mapbox_cameraTargetLng="-77.00897" - app:mapbox_cameraZoom="10" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> + app:mapbox_cameraZoom="10"/> </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml index 4428100e41..c9df5a8574 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml @@ -11,7 +11,6 @@ android:layout_height="wrap_content" app:mapbox_cameraTargetLat="-1.063510" app:mapbox_cameraTargetLng=" 32.895425" - app:mapbox_cameraZoom="4" - app:mapbox_styleUrl="@string/mapbox_style_satellite_streets"/> + app:mapbox_cameraZoom="4"/> -</RelativeLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml index 51442894e1..1f856bcd94 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml @@ -23,8 +23,7 @@ android:layout_weight="0.5" mapbox:mapbox_cameraTargetLat="38.913187" mapbox:mapbox_cameraTargetLng="-77.032546" - mapbox:mapbox_cameraZoom="12" - mapbox:mapbox_styleUrl="mapbox://styles/mapbox/streets-v10" /> + mapbox:mapbox_cameraZoom="12" /> <!-- SF --> <fragment @@ -35,8 +34,7 @@ android:layout_weight="0.5" mapbox:mapbox_cameraTargetLat="37.775732" mapbox:mapbox_cameraTargetLng="-122.413985" - mapbox:mapbox_cameraZoom="13" - mapbox:mapbox_styleUrl="mapbox://styles/mapbox/outdoors-v10" /> + mapbox:mapbox_cameraZoom="13"/> </LinearLayout> <LinearLayout @@ -55,8 +53,7 @@ android:layout_weight="0.5" mapbox:mapbox_cameraTargetLat="12.97913" mapbox:mapbox_cameraTargetLng="77.59188" - mapbox:mapbox_cameraZoom="14" - mapbox:mapbox_styleUrl="mapbox://styles/mapbox/light-v9" /> + mapbox:mapbox_cameraZoom="14" /> <!-- Ayacucho --> <fragment @@ -67,7 +64,6 @@ android:layout_weight="0.5" mapbox:mapbox_cameraTargetLat="-13.155980" mapbox:mapbox_cameraTargetLng="-74.217134" - mapbox:mapbox_cameraZoom="15" - mapbox:mapbox_styleUrl="mapbox://styles/mapbox/dark-v9" /> + mapbox:mapbox_cameraZoom="15" /> </LinearLayout> </LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml index 3f8c384b3f..9bcfd0300e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml @@ -12,7 +12,6 @@ app:mapbox_uiAttributionTintColor="@android:color/holo_green_dark" app:mapbox_cameraTargetLat="47.798202" app:mapbox_cameraTargetLng="7.573781" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets" app:mapbox_cameraZoom="4" /> <android.support.design.widget.FloatingActionButton diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml index c2098b0f5b..88e27e1de1 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml @@ -13,7 +13,6 @@ app:mapbox_cameraTargetLat="45.1855569" app:mapbox_cameraTargetLng="5.7215506" app:mapbox_cameraZoom="11" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets" app:mapbox_uiAttributionGravity="top|end" app:mapbox_uiLogoGravity="top|end" app:mapbox_uiLogoMarginRight="28dp"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_print.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_print.xml index 71f1586603..3ff8caea70 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_print.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_print.xml @@ -18,7 +18,6 @@ android:layout_gravity="end|bottom" android:layout_margin="@dimen/fab_margin" android:src="@drawable/ic_print" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets" app:backgroundTint="@color/accent"/> </android.support.design.widget.CoordinatorLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_point.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_point.xml index 6978ae871d..66750dc47e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_point.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_point.xml @@ -11,7 +11,6 @@ android:layout_height="match_parent" app:mapbox_cameraTargetLat="52.0907" app:mapbox_cameraTargetLng="5.1214" - app:mapbox_cameraZoom="16" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> + app:mapbox_cameraZoom="16"/> </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_restricted_bounds.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_restricted_bounds.xml index e17807201b..bea754c161 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_restricted_bounds.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_restricted_bounds.xml @@ -12,7 +12,6 @@ android:layout_height="match_parent" app:mapbox_cameraTargetLat="64.840048" app:mapbox_cameraTargetLng="-18.910457" - app:mapbox_cameraZoom="4" - app:mapbox_styleUrl="@string/mapbox_style_satellite_streets"/> + app:mapbox_cameraZoom="4"/> </android.support.design.widget.CoordinatorLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml index cfbd07ce39..fea40d55a3 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml @@ -86,7 +86,6 @@ android:layout_height="match_parent" app:mapbox_cameraTargetLat="37.176546" app:mapbox_cameraTargetLng="-3.599007" - app:mapbox_styleUrl="@string/mapbox_style_dark" app:mapbox_cameraZoom="15" /> <android.support.design.widget.FloatingActionButton diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml index 83150be4bf..0261131df5 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml @@ -11,8 +11,7 @@ android:layout_height="match_parent" app:mapbox_cameraTargetLat="52.519003" app:mapbox_cameraTargetLng="13.400972" - app:mapbox_cameraZoom="16" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> + app:mapbox_cameraZoom="16"/> <android.support.design.widget.FloatingActionButton android:id="@+id/fab_style_json" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbol_generator.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbol_generator.xml index ffcdddce57..0fa030fa1c 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbol_generator.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbol_generator.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> <com.mapbox.mapboxsdk.maps.MapView android:id="@id/mapView" android:layout_width="match_parent" - android:layout_height="match_parent" - app:mapbox_styleUrl="@string/mapbox_style_outdoors"/> + android:layout_height="match_parent"/> </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml index 0bb59451ab..90fe634e7a 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml @@ -11,7 +11,6 @@ android:layout_height="match_parent" app:mapbox_cameraTargetLat="40.730648" app:mapbox_cameraTargetLng="-73.993619" - app:mapbox_cameraZoom="11" - app:mapbox_styleUrl="@string/mapbox_style_light"/> + app:mapbox_cameraZoom="11"/> </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml index b8ea3d847e..c2e3270eb3 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml @@ -11,7 +11,6 @@ android:layout_height="match_parent" mapbox:mapbox_cameraTargetLat="47.6077" mapbox:mapbox_cameraTargetLng="-122.3421" - mapbox:mapbox_cameraZoom="11" - mapbox:mapbox_styleUrl="mapbox://styles/mapbox/streets-v10" /> + mapbox:mapbox_cameraZoom="11"/> </LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map.xml index c4c17a25ff..3224b73477 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map.xml @@ -8,5 +8,4 @@ app:mapbox_cameraTargetLat="45.38301927899065" app:mapbox_cameraTargetLng="8.63525390625" app:mapbox_renderTextureMode="true" - app:mapbox_cameraZoom="7" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> + app:mapbox_cameraZoom="7"/> |