From dc98966e6d6241685096389712b96dabe11d57bb Mon Sep 17 00:00:00 2001
From: Brad Leege <bleege@gmail.com>
Date: Sat, 10 Oct 2015 18:18:17 -0500
Subject: [PATCH] [android] #2588 - Moving InfoWindow classes to annotations
 package

---
 .../{views => annotations}/InfoWindow.java      |  5 ++---
 .../InfoWindowTipView.java                      |  2 +-
 .../mapbox/mapboxsdk/annotations/Marker.java    |  2 --
 .../com/mapbox/mapboxsdk/views/MapView.java     | 17 +++++++++++++----
 .../src/main/res/layout/infowindow.xml          |  2 +-
 5 files changed, 17 insertions(+), 11 deletions(-)
 rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/{views => annotations}/InfoWindow.java (98%)
 rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/{views => annotations}/InfoWindowTipView.java (96%)

diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindow.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
similarity index 98%
rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindow.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
index 4a17c78c9..534122e27 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindow.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
@@ -1,4 +1,4 @@
-package com.mapbox.mapboxsdk.views;
+package com.mapbox.mapboxsdk.annotations;
 
 import android.content.Context;
 import android.graphics.PointF;
@@ -7,9 +7,8 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-
-import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.mapbox.mapboxsdk.views.MapView;
 
 /**
  * A tooltip view
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindowTipView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java
similarity index 96%
rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindowTipView.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java
index a12587dd8..3e1668498 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindowTipView.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java
@@ -1,4 +1,4 @@
-package com.mapbox.mapboxsdk.views;
+package com.mapbox.mapboxsdk.annotations;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
index 79774b062..d32b097d5 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
@@ -6,8 +6,6 @@ import android.text.TextUtils;
 import android.view.View;
 import com.mapbox.mapboxsdk.R;
 import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.views.InfoWindow;
-import com.mapbox.mapboxsdk.views.MapView;
 
 public class Marker extends Annotation {
 
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
index e5c12be45..4af2278ea 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
@@ -54,6 +54,7 @@ import com.almeros.android.multitouch.gesturedetectors.RotateGestureDetector;
 import com.almeros.android.multitouch.gesturedetectors.TwoFingerGestureDetector;
 import com.mapbox.mapboxsdk.R;
 import com.mapbox.mapboxsdk.annotations.Annotation;
+import com.mapbox.mapboxsdk.annotations.InfoWindow;
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.annotations.Polygon;
@@ -1882,8 +1883,13 @@ public final class MapView extends FrameLayout {
         return new ArrayList<>(annotations);
     }
 
-    // Used by InfoWindow
-    double getTopOffsetPixelsForAnnotationSymbol(@NonNull String symbolName) {
+    /**
+     * Get Top Offset for the annotation symbol.
+     * Used by InfoWindow
+     * @param symbolName Annotation Symbol
+     * @return Top Offset in pixels
+     */
+    public double getTopOffsetPixelsForAnnotationSymbol(@NonNull String symbolName) {
         return mNativeMapView.getTopOffsetPixelsForAnnotationSymbol(symbolName);
     }
 
@@ -1901,8 +1907,11 @@ public final class MapView extends FrameLayout {
         return mNativeMapView.getMetersPerPixelAtLatitude(latitude, getZoomLevel());
     }
 
-    // Used by InfoWindow
-    float getScreenDensity() {
+    /**
+     * Get ScreenDensity of device
+     * @return Screen Density ratio
+     */
+    public float getScreenDensity() {
         return mScreenDensity;
     }
 
diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow.xml b/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow.xml
index aa54ddd8e..e106b8ddb 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow.xml
+++ b/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow.xml
@@ -44,7 +44,7 @@
             android:visibility="gone"/>
     </LinearLayout>
 
-    <com.mapbox.mapboxsdk.views.InfoWindowTipView
+    <com.mapbox.mapboxsdk.annotations.InfoWindowTipView
         android:layout_width="fill_parent"
         android:layout_height="10dp"/>