diff options
author | Cameron Mace <cameron@mapbox.com> | 2017-01-23 13:27:02 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-23 13:27:02 -0500 |
commit | 9b726441911224e27c0fd001f43dbeeee42e3079 (patch) | |
tree | 28916f3e6e408c6808268f4766edd1879cdc6cdf /platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java | |
parent | 7cf317c08ce89d10a8ac01cd21caf035bfc9dc5e (diff) | |
download | qtlocation-mapboxgl-9b726441911224e27c0fd001f43dbeeee42e3079.tar.gz |
Test app refactor (#7598)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java index 44f11ca674..76e38018ca 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java @@ -3,12 +3,11 @@ package com.mapbox.mapboxsdk.testapp.activity.annotation; import android.graphics.Color; import android.os.Bundle; import android.support.annotation.NonNull; -import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.widget.Toast; import com.mapbox.mapboxsdk.annotations.Polyline; import com.mapbox.mapboxsdk.annotations.PolylineOptions; @@ -52,15 +51,6 @@ public class PolylineActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_polyline); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - - ActionBar actionBar = getSupportActionBar(); - if (actionBar != null) { - actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setDisplayShowHomeEnabled(true); - } - if (savedInstanceState != null) { polylineOptions = savedInstanceState.getParcelableArrayList(STATE_POLYLINE_OPTIONS); } else { @@ -182,11 +172,16 @@ public class PolylineActivity extends AppCompatActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { + if (polylines.size() <= 0) { + Toast.makeText(PolylineActivity.this, "No polylines on map", Toast.LENGTH_LONG).show(); + return super.onOptionsItemSelected(item); + } switch (item.getItemId()) { case R.id.action_id_remove: // test to remove all annotations polylineOptions.clear(); mapboxMap.clear(); + polylines.clear(); return true; case R.id.action_id_alpha: @@ -216,11 +211,6 @@ public class PolylineActivity extends AppCompatActivity { p.setAlpha(visible ? (fullAlpha ? FULL_ALPHA : PARTIAL_ALPHA) : NO_ALPHA); } return true; - - case android.R.id.home: - onBackPressed(); - return true; - default: return super.onOptionsItemSelected(item); } |