Skip to content
This repository has been archived by the owner on Oct 7, 2024. It is now read-only.

Commit

Permalink
Merge branch 'ls-moving-icon-with-trailing-line' of https://github.co…
Browse files Browse the repository at this point in the history
…m/mapbox/mapbox-android-demo into ls-moving-icon-with-trailing-line
  • Loading branch information
Langston Smith committed Jun 20, 2019
2 parents 9bf35a1 + a473c3c commit 0808ee4
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,7 @@ private void initializeModels() {
null,
R.string.activity_java_services_optimization_url, false, BuildConfig.MIN_SDK_VERSION));


exampleItemModels.add(new ExampleItemModel(
R.id.nav_java_services,
R.string.activity_java_services_static_image_title,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
<string name="activity_dds_symbol_collision_detection_description">Allow or deny text and icons to overlap and collide.</string>
<string name="activity_dds_polygon_revealed_hole_outline_description">Outline a polygon hole to highlight a revealed region.</string>
<string name="activity_styles_text_field_formatting_description">Adjust the color, size, and fonts of SymbolLayer text fields.</string>
<string name="activity_dds_moving_icon_with_trailing_line_description">Draw a vector polygon with holes on a map using the Mapbox Maps SDK.</string>
<string name="activity_annotation_marker_view_description">Attach a view to a given position on the map.</string>
<string name="activity_annotation_custom_info_window_description">Use an info window adapter to customize the info window.</string>
<string name="activity_camera_animate_description">"Animate the map's camera position, tilt, bearing, and zoom."</string>
Expand Down
1 change: 0 additions & 1 deletion MapboxAndroidDemo/src/main/res/values/titles_strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
<string name="activity_dds_symbol_collision_detection_title">Toggle collision detection</string>
<string name="activity_dds_polygon_revealed_hole_outline_title">Outlined polygon hole</string>
<string name="activity_styles_text_field_formatting_title">Adjust text labels</string>
<string name="activity_dds_moving_icon_with_trailing_line_title">Line behind moving icon</string>
<string name="activity_annotation_marker_view_title">Draw a marker view</string>
<string name="activity_annotation_custom_info_window_title">Custom info window</string>
<string name="activity_camera_animate_title">Animate the map camera</string>
Expand Down
1 change: 0 additions & 1 deletion MapboxAndroidDemo/src/main/res/values/urls_strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
<string name="activity_dds_symbol_collision_detection_url" translatable="false">https://i.imgur.com/nV1YnIv.png</string>
<string name="activity_dds_polygon_revealed_hole_outline_url" translatable="false">http://i.imgur.com/19GZh8H.jpg</string>
<string name="activity_styles_text_field_formatting_url" translatable="false">https://i.imgur.com/MSoIYmU.png</string>
<string name="activity_dds_moving_icon_with_trailing_line_url" translatable="false">https://i.imgur.com/6hcqbNw.png</string>
<string name="activity_annotation_basic_marker_view_url" translatable="false">http://i.imgur.com/vbWTLIE.png</string>
<string name="activity_annotation_custom_info_window_url" translatable="false">http://i.imgur.com/mCWbosy.png</string>
<string name="activity_annotation_marker_url" translatable="false">http://i.imgur.com/X59UoaY.png</string>
Expand Down

0 comments on commit 0808ee4

Please sign in to comment.