From a394578876ecc9ce563b5d3fd5877e06d269e51f Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun.van.nuland@gmail.com>
Date: Tue, 21 Feb 2017 15:00:48 +0100
Subject: [PATCH] [android] - rename simple example map view  (#8132)

* [android] - rename simple example map view from Wear module to explicitly state Wear in it's name

* ignore flaky test
---
 .../com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java     | 1 +
 .../MapboxGLAndroidSDKWearTestApp/src/main/AndroidManifest.xml  | 2 +-
 .../mapbox/weartestapp/activity/FeatureOverviewActivity.java    | 2 +-
 .../{SimpleMapViewActivity.java => SimpleWearMapActivity.java}  | 2 +-
 .../src/main/res/layout/activity_simple_mapview.xml             | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/activity/{SimpleMapViewActivity.java => SimpleWearMapActivity.java} (96%)

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java
index ab8688a05..83e7d6084 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraEaseTest.java
@@ -118,6 +118,7 @@ public class CameraEaseTest {
   }
 
   @Test
+  @Ignore
   public void testEaseToBounds() {
     ViewUtils.checkViewIsDisplayed(R.id.mapView);
     final MapboxMap mapboxMap = rule.getActivity().getMapboxMap();
diff --git a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/AndroidManifest.xml
index b75d644b0..36588a89f 100644
--- a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/AndroidManifest.xml
+++ b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
         </activity>
 
         <activity
-            android:name=".activity.SimpleMapViewActivity"
+            android:name=".activity.SimpleWearMapActivity"
             android:label="@string/activity_simple_mapview_title">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/activity/FeatureOverviewActivity.java b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/activity/FeatureOverviewActivity.java
index 2a8bf9396..1fe8a6cf1 100644
--- a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/activity/FeatureOverviewActivity.java
+++ b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/activity/FeatureOverviewActivity.java
@@ -32,7 +32,7 @@ public class FeatureOverviewActivity extends WearableActivity implements Feature
 
     exampleItemModels = new ArrayList<>();
     exampleItemModels.add(new Feature(R.string.activity_simple_mapview_title, new Intent(FeatureOverviewActivity.this,
-      SimpleMapViewActivity.class)));
+      SimpleWearMapActivity.class)));
 
     FeatureAdapter exampleAdapter = new FeatureAdapter(FeatureOverviewActivity.this, exampleItemModels);
     wearableRecyclerView.setAdapter(exampleAdapter);
diff --git a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/activity/SimpleMapViewActivity.java b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/activity/SimpleWearMapActivity.java
similarity index 96%
rename from platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/activity/SimpleMapViewActivity.java
rename to platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/activity/SimpleWearMapActivity.java
index b24b626fe..f5bca0e05 100644
--- a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/activity/SimpleMapViewActivity.java
+++ b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/java/com/mapbox/weartestapp/activity/SimpleWearMapActivity.java
@@ -8,7 +8,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.weartestapp.R;
 
-public class SimpleMapViewActivity extends WearableActivity {
+public class SimpleWearMapActivity extends WearableActivity {
 
   private MapView mapView;
 
diff --git a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/res/layout/activity_simple_mapview.xml b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/res/layout/activity_simple_mapview.xml
index 4dc318174..8f260c46f 100644
--- a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/res/layout/activity_simple_mapview.xml
+++ b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/res/layout/activity_simple_mapview.xml
@@ -6,7 +6,7 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activity.SimpleMapViewActivity"
+    tools:context=".activity.SimpleWearMapActivity"
     tools:deviceIds="wear">
 
     <com.mapbox.mapboxsdk.maps.MapView