Merge pull request #113 from hieupham007/timob-19314

[TIMOB-19314/TIMOB-18082]: Update toImage() signature and strip google-services library
tidev · Aug 5, 2015 · a50dd64 · a50dd64
2 parents e11e3dd + 55adee3
commit a50dd64
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/android/dist/ti.map-android-2.3.2.zip b/android/dist/ti.map-android-2.3.2.zip
diff --git a/android/dist/ti.map-android-2.3.3.zip b/android/dist/ti.map-android-2.3.3.zip
diff --git a/android/documentation/changelog.md b/android/documentation/changelog.md
@@ -1,5 +1,8 @@
 # Change Log
 <pre>
+v2.3.3    Update toImage() signature [TIMOB-19314]
+          Strip down Google Play Services library to include only maps components [TIMOB-18082]
+
 v2.3.2    Update Google Play Services library and assets [TIMOB-18988]
 
 v2.3.1    Add drawing support. Includes polygons, polylines, and circles. [TIMOB-15410]

diff --git a/android/lib/google-play-services-base.jar b/android/lib/google-play-services-base.jar
diff --git a/android/lib/google-play-services-map.jar b/android/lib/google-play-services-map.jar
diff --git a/android/lib/google-play-services.jar b/android/lib/google-play-services.jar
diff --git a/android/manifest b/android/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.3.2
+version: 2.3.3
 apiversion: 2
 architectures: armeabi armeabi-v7a x86
 description: External version of Map module to support new Google Map v2 sdk
@@ -16,5 +16,5 @@ name: map
 moduleid: ti.map
 guid: f0d8fd44-86d2-4730-b67d-bd454577aeee
 platform: android
-minsdk: 4.0.0
+minsdk: 4.1.0
 respackage: com.google.android.gms
diff --git a/android/src/ti/map/AnnotationProxy.java b/android/src/ti/map/AnnotationProxy.java
@@ -203,16 +203,14 @@ public void processOptions()
 	private void handleCustomView(Object obj)
 	{
 		if (obj instanceof TiViewProxy) {
-			KrollDict d = ((TiViewProxy) obj).toImage();
-			Object imageBlob = d.get(TiC.PROPERTY_MEDIA);
-			if (imageBlob instanceof TiBlob) {
-				Bitmap image = ((TiBlob) imageBlob).getImage();
-				if (image != null) {
-					markerOptions.icon(BitmapDescriptorFactory.fromBitmap(image));
-					setIconImageHeight(image.getHeight());
-					return;
-				}
+			TiBlob imageBlob = ((TiViewProxy) obj).toImage();
+			Bitmap image = imageBlob.getImage();
+			if (image != null) {
+				markerOptions.icon(BitmapDescriptorFactory.fromBitmap(image));
+				setIconImageHeight(image.getHeight());
+				return;
 			}
+
 		}
 		Log.w(TAG, "Unable to get the image from the custom view: " + obj);
 		setIconImageHeight(-1);