[android] - enforce usage bitmap for icon, cleanup test app resources (#7906)

1 files changed, 19 insertions, 83 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
index aa36616373..2012a92593 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -1,17 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <string name="app_name">Mapbox Android SDK TestApp</string>
 
-    <!-- Test Activities -->
-    <string name="activity_mapboxmap">MapboxMap Activity</string>
-
-    <!-- Fragment -->
+    <!--Activity-->
     <string name="activity_map_fragment_suport">Support Map Fragment</string>
     <string name="activity_map_fragment">Map Fragment</string>
     <string name="activity_multimap">Multiple Maps on Screen</string>
-
-    <!-- Annotations -->
     <string name="activity_add_bulk_markers">Add Markers In Bulk</string>
     <string name="activity_animated_marker">Animated Markers</string>
     <string name="activity_dynamic_marker">Dynamic Marker</string>
@@ -20,22 +14,15 @@
     <string name="activity_press_for_marker">Press Map For Marker</string>
     <string name="activity_view_marker">View Marker API</string>
     <string name="activity_add_remove_markers">Add/Remove marker</string>
-
-    <!-- InfoWindow-->
     <string name="activity_info_window">Standard InfoWindow</string>
     <string name="activity_infowindow_adapter">Custom InfoWindow</string>
     <string name="activity_dynamic_infowindow_adapter">Custom Dynamic InfoWindow</string>
-
-    <!-- Camera -->
     <string name="activity_camera_animation_types">Animation Types</string>
     <string name="activity_camera_zoom">Zoom Methods</string>
     <string name="activity_visible_coordinate_bounds">LatLngBounds Method</string>
     <string name="activity_camera_position">CameraPosition Method</string>
     <string name="activity_scroll_by">Scroll By Method</string>
-
-    <!-- Other -->
     <string name="activity_double_map">Double Map Activity</string>
-    <string name="activity_back_to_map">Back to map activity</string>
     <string name="activity_snapshot">Snapshot Activity</string>
     <string name="activity_user_tracking_mode">User tracking mode</string>
     <string name="activity_user_tracking_customization">User location drawable</string>
@@ -66,7 +53,7 @@
     <string name="activity_map_in_dialog">Dialog with map</string>
     <string name="activity_marker_view_rectangle">Marker views in rectangle</string>
 
-    <!-- Description -->
+    <!--Description-->
     <string name="description_user_location_tracking">Tracks the location of the user</string>
     <string name="description_user_location_customization">Customize the location of the user</string>
     <string name="description_user_location_dot_color">Customize the user location color</string>
@@ -81,7 +68,6 @@
     <string name="description_camera_zoom">Different types of zoom methods</string>
     <string name="description_minmax_zoom">Configure a max and min zoomlevel</string>
     <string name="description_info_window">Learn how to handle the InfoWindow</string>
-    <string name="description_info_window_concurrent">InfoWindow example with multiple open</string>
     <string name="description_add_bulk_markers">Add Markers In Bulk to a Map</string>
     <string name="description_camera_animation_types">Showcase the different animation types</string>
     <string name="description_visible_bounds">Center the camera around a bounds</string>
@@ -96,7 +82,6 @@
     <string name="description_scroll_by">Scroll with pixels in x,y direction</string>
     <string name="description_snapshot">Example to make a snapshot of the map</string>
     <string name="description_doublemap">2 maps in a view hierarchy</string>
-    <string name="description_back_to_map">Restart map view after temporarily leaving to another activity</string>
     <string name="description_view_marker">Use an Android SDK View as marker</string>
     <string name="description_dynamic_info_window_adapter">Learn how to create a dynamic custom InfoWindow</string>
     <string name="description_viewpager">Use SupportMapFragments in a ViewPager</string>
@@ -119,12 +104,7 @@
     <string name="description_marker_view_rectangle">Marker Views within a rectangle</string>
     <string name="description_circle_layer">Show bus stops and route in Singapore</string>
 
-    <string name="menuitem_title_concurrent_infowindow">Concurrent Open InfoWindows</string>
-    <string name="menuitem_title_deselect_markers_on_tap">Deselect Markers On Tap</string>
-    <string name="menuitem_title_tracking_mode_dismiss_on_gesture">Dismiss location tracking on gesture</string>
-    <string name="menuitem_title_bearing_mode_dismiss_on_gesture">Dismiss bearing tracking on gesture</string>
-    <string name="menuitem_title_reset">Reset</string>
-
+    <!--Categories-->
     <string name="category">category</string>
     <string name="category_basic">_Basic</string>
     <string name="category_annotation">Annotation</string>
@@ -139,87 +119,43 @@
     <string name="category_style">Styling</string>
     <string name="category_features">Features</string>
 
-    <string name="action_visible_bounds_explanation">Center map around 2 markers</string>
+    <!--Actions-->
     <string name="action_remove_polylines">Remove polylines</string>
-
     <string name="action_visibility_polygon">Change visibility</string>
     <string name="action_alpha_polygon">Change alpha</string>
     <string name="action_points_polygon">Change points</string>
     <string name="action_color_polygon">Change color</string>
     <string name="action_width_polyline">Change width</string>
 
+    <!--Menu-->
+    <string name="menuitem_title_concurrent_infowindow">Concurrent Open InfoWindows</string>
+    <string name="menuitem_title_deselect_markers_on_tap">Deselect Markers On Tap</string>
+    <string name="menuitem_title_tracking_mode_dismiss_on_gesture">Dismiss location tracking on gesture</string>
+    <string name="menuitem_title_bearing_mode_dismiss_on_gesture">Dismiss bearing tracking on gesture</string>
+    <string name="menuitem_title_reset">Reset</string>
+    <string name="menuitem_title_rotate_gesture_enabled">Enable rotate gestures</string>
+    <string name="menuitem_title_scroll_gesture_enabled">Enable scroll gestures</string>
+
+    <!--Button-->
     <string name="button_camera_move">Move</string>
     <string name="button_camera_ease">Ease</string>
     <string name="button_camera_animate">Animate</string>
-    <string name="button_make_snapshot">Snapshot</string>
     <string name="button_user_dot_default">Default</string>
     <string name="button_user_dot_tint">Tint dot</string>
     <string name="button_user_accuracy_ring_tint">Tint ring</string>
     <string name="button_user_transparent_tint">tran</string>
     <string name="button_open_dialog">Open dialog</string>
-
-    <string name="label_fps">FPS:</string>
-
-    <string name="styleMapboxStreets">Mapbox Streets</string>
-    <string name="styleEmerald">Emerald</string>
-    <string name="styleLight">Light</string>
-    <string name="styleDark">Dark</string>
-    <string name="styleSatellite">Satellite</string>
-    <string name="styleSatelliteStreets">Satellite Streets</string>
-
-    <string-array name="outdoors_class_list">
-        <item>Day</item>
-        <item>Night</item>
-    </string-array>
-
-    <string-array name="bulk_marker_list">
-        <item>10</item>
-        <item>100</item>
-        <item>500</item>
-        <item>1000</item>
-        <item>10000</item>
-    </string-array>
-
-    <string-array name="user_tracking_mode">
-        <item>Disabled</item>
-        <item>Follow tracking</item>
-    </string-array>
-
-    <string-array name="user_bearing_mode">
-        <item>Disabled</item>
-        <item>GPS bearing</item>
-        <item>Compass bearing</item>
-        <!--<item>Combined mode</item>-->
-    </string-array>
-
-    <string name="zoom_botton">Zoom</string>
-
-    <string name="scrollby_x_value">X: %1$d</string>
-    <string name="scrollby_y_value">Y: %1$d</string>
     <string name="button_download_region">Download region</string>
     <string name="button_list_regions">List regions</string>
 
+    <!--Other-->
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+    <string name="scrollby_x_value">X: %1$d</string>
+    <string name="scrollby_y_value">Y: %1$d</string>
     <string name="dialog_camera_position">Animate to new position</string>
-
-    <string name="geocoder_instructions">Tap Map To Geocode Where Black Marker Is Currently Located</string>
-
     <string name="dynamic_marker_chelsea_title">Chelsea</string>
     <string name="dynamic_marker_chelsea_snippet">Stamford Bridge</string>
     <string name="dynamic_marker_arsenal_title">Arsenal</string>
     <string name="dynamic_marker_arsenal_snippet">Emirates Stadium</string>
-
-    <string name="navigation_select_location_button_text">Select Location!</string>
-
-    <string name="title_section1">Different style</string>
-    <string name="title_section2">Show Snackbar</string>
-
-    <string name="navigation_drawer_open">Open navigation drawer</string>
-    <string name="navigation_drawer_close">Close navigation drawer</string>
-
-    <string name="action_example">Example action</string>
-
-    <string name="action_settings">Settings</string>
-    <string name="menuitem_title_rotate_gesture_enabled">Enable rotate gestures</string>
-    <string name="menuitem_title_scroll_gesture_enabled">Enable scroll gestures</string>
-
 </resources>