summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlangsmith <langstonlmcs@gmail.com>2019-06-17 13:15:40 -0700
committerlangsmith <langstonlmcs@gmail.com>2019-06-17 13:15:40 -0700
commitd373ef6323e6712fe161921815855d9b2a887056 (patch)
tree7f0600a01444eecfc21ae7eb918d0817912c4cd7
parentc3e94a06480339fe911386cd8be43bdf3e54a17d (diff)
downloadqtlocation-mapboxgl-upstream/ls-adding-camera-modes-to-locationcomponent-camera-options-activity.tar.gz
[android] added noneCompass and noneGps to LocationModesActivityupstream/ls-adding-camera-modes-to-locationcomponent-camera-options-activity
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java
index f9adf608a1..6ec64e1d0c 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java
@@ -356,6 +356,8 @@ public class LocationModesActivity extends AppCompatActivity implements OnMapRea
private void showTrackingListDialog() {
List<String> trackingTypes = new ArrayList<>();
trackingTypes.add("None");
+ trackingTypes.add("None Compass");
+ trackingTypes.add("None GPS");
trackingTypes.add("Tracking");
trackingTypes.add("Tracking Compass");
trackingTypes.add("Tracking GPS");
@@ -370,6 +372,10 @@ public class LocationModesActivity extends AppCompatActivity implements OnMapRea
locationTrackingBtn.setText(selectedTrackingType);
if (selectedTrackingType.contentEquals("None")) {
setCameraTrackingMode(CameraMode.NONE);
+ } else if (selectedTrackingType.contentEquals("None Compass")) {
+ setCameraTrackingMode(CameraMode.NONE_COMPASS);
+ } else if (selectedTrackingType.contentEquals("None GPS")) {
+ setCameraTrackingMode(CameraMode.NONE_GPS);
} else if (selectedTrackingType.contentEquals("Tracking")) {
setCameraTrackingMode(CameraMode.TRACKING);
} else if (selectedTrackingType.contentEquals("Tracking Compass")) {
@@ -409,6 +415,10 @@ public class LocationModesActivity extends AppCompatActivity implements OnMapRea
this.cameraMode = currentMode;
if (currentMode == CameraMode.NONE) {
locationTrackingBtn.setText("None");
+ } else if (currentMode == CameraMode.NONE_COMPASS) {
+ locationTrackingBtn.setText("None Compass");
+ } else if (currentMode == CameraMode.NONE_GPS) {
+ locationTrackingBtn.setText("None GPS");
} else if (currentMode == CameraMode.TRACKING) {
locationTrackingBtn.setText("Tracking");
} else if (currentMode == CameraMode.TRACKING_COMPASS) {