summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2016-04-06 11:02:25 -0500
committerBrad Leege <bleege@gmail.com>2016-04-06 11:02:25 -0500
commit3670c8a9145fbff9588038593d0eab31fdacfc83 (patch)
tree2af46cc35b3310df6abe1fe59eca011f0294c07b
parent4b05705194cde9b9434ff579063d067a869320f8 (diff)
downloadqtlocation-mapboxgl-3670c8a9145fbff9588038593d0eab31fdacfc83.tar.gz
[android] #4609 - Restoring name of BulkMarkerActivity
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/BulkMarkerActivityTest.java (renamed from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/AddMarkerActivityTest.java)12
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml2
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java (renamed from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AddMarkerActivity.java)6
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml4
4 files changed, 12 insertions, 12 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/AddMarkerActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/BulkMarkerActivityTest.java
index 0a29b5fa47..b85fe41243 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/AddMarkerActivityTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/BulkMarkerActivityTest.java
@@ -4,7 +4,7 @@ import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.LargeTest;
-import com.mapbox.mapboxsdk.testapp.activity.annotation.AddMarkerActivity;
+import com.mapbox.mapboxsdk.testapp.activity.annotation.BulkMarkerActivity;
import com.mapbox.mapboxsdk.testapp.R;
import org.junit.Before;
@@ -13,17 +13,17 @@ import org.junit.Test;
import org.junit.runner.RunWith;
/**
- * Tests on AddMarkerActivity
+ * Tests on BulkMarkerActivity
*/
@RunWith(AndroidJUnit4.class)
@LargeTest
-public class AddMarkerActivityTest extends BaseTest {
+public class BulkMarkerActivityTest extends BaseTest {
@Rule
- public ActivityTestRule<AddMarkerActivity> mActivityRule = new ActivityTestRule<>(
- AddMarkerActivity.class);
+ public ActivityTestRule<BulkMarkerActivity> mActivityRule = new ActivityTestRule<>(
+ BulkMarkerActivity.class);
- private AddMarkerActivity mActivity = null;
+ private BulkMarkerActivity mActivity = null;
@Before
public void setActivity() {
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index c21594dba4..93f66819c2 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -41,7 +41,7 @@
android:value="@string/category_infowindow" />
</activity>
<activity
- android:name=".activity.annotation.AddMarkerActivity"
+ android:name=".activity.annotation.BulkMarkerActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:description="@string/description_add_bulk_markers"
android:label="@string/activity_add_bulk_markers">
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AddMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
index 628f969509..ae3210c251 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AddMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
@@ -30,7 +30,7 @@ import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
-public class AddMarkerActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener {
+public class BulkMarkerActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener {
private MapboxMap mMapboxMap;
private MapView mMapView;
@@ -63,7 +63,7 @@ public class AddMarkerActivity extends AppCompatActivity implements AdapterView.
spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
Spinner spinner = (Spinner) findViewById(R.id.spinner);
spinner.setAdapter(spinnerAdapter);
- spinner.setOnItemSelectedListener(AddMarkerActivity.this);
+ spinner.setOnItemSelectedListener(BulkMarkerActivity.this);
}
}
});
@@ -177,4 +177,4 @@ public class AddMarkerActivity extends AppCompatActivity implements AdapterView.
mProgressDialog.hide();
}
}
-} \ No newline at end of file
+}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
index fcaa7e7090..c7aabc96d7 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -11,7 +11,7 @@
<string name="activity_map_fragment">Map Fragment</string>
<!-- Annotations -->
- <string name="activity_add_bulk_markers">Add Markers</string>
+ <string name="activity_add_bulk_markers">Add Markers In Bulk</string>
<string name="activity_animated_marker">Animated Marker (experimental)</string>
<string name="activity_dynamic_marker">Dynamic Marker</string>
<string name="activity_polyline">Polyline</string>
@@ -52,7 +52,7 @@
<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 to a Map</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>
<string name="description_dynamic_marker">Update position and icon</string>