1 files changed, 1 insertions, 90 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index 18fbf33cc8..84adacd2f5 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -26,52 +26,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.infowindow.InfoWindowActivity"
-            android:description="@string/description_info_window"
-            android:label="@string/activity_info_window">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_infowindow" />
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity" />
-        </activity>
-        <activity
-            android:name=".activity.infowindow.InfoWindowAdapterActivity"
-            android:description="@string/description_info_window_adapter"
-            android:label="@string/activity_infowindow_adapter">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_infowindow" />
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity" />
-        </activity>
-        <activity
-            android:name=".activity.infowindow.DynamicInfoWindowAdapterActivity"
-            android:description="@string/description_dynamic_info_window_adapter"
-            android:label="@string/activity_dynamic_infowindow_adapter">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_infowindow" />
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity" />
-        </activity>
-        <activity
-            android:name=".activity.annotation.BulkMarkerActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:description="@string/description_add_bulk_markers"
-            android:label="@string/activity_add_bulk_markers">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_annotation" />
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity" />
-        </activity>
-        <activity
-            android:name=".activity.annotation.AnimatedSymbolLayerActivity"
+            android:name=".activity.style.AnimatedSymbolLayerActivity"
             android:description="@string/description_animated_symbollayer"
             android:label="@string/activity_animated_symbollayer">
             <meta-data
@@ -82,28 +37,6 @@
                 android:value=".activity.FeatureOverviewActivity" />
         </activity>
         <activity
-            android:name=".activity.annotation.DynamicMarkerChangeActivity"
-            android:description="@string/description_dynamic_marker"
-            android:label="@string/activity_dynamic_marker">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_annotation" />
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity" />
-        </activity>
-        <activity
-            android:name=".activity.annotation.PressForMarkerActivity"
-            android:description="@string/description_press_for_marker"
-            android:label="@string/activity_press_for_marker">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_annotation" />
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity" />
-        </activity>
-        <activity
             android:name=".activity.camera.CameraAnimationTypeActivity"
             android:description="@string/description_camera_animation_types"
             android:label="@string/activity_camera_animation_types">
@@ -228,28 +161,6 @@
                 android:value=".activity.FeatureOverviewActivity" />
         </activity>
         <activity
-            android:name=".activity.annotation.PolygonActivity"
-            android:description="@string/description_polygon"
-            android:label="@string/activity_polygon">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_annotation" />
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity" />
-        </activity>
-        <activity
-            android:name=".activity.annotation.PolylineActivity"
-            android:description="@string/description_polyline"
-            android:label="@string/activity_polyline">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_annotation" />
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity" />
-        </activity>
-        <activity
             android:name=".activity.camera.ScrollByActivity"
             android:description="@string/description_scroll_by"
             android:label="@string/activity_scroll_by"