Merge pull request #7744 from hieupham007/timob-20410-5_2_X

[TIMOB-20410](5_2_X): Backport
tidev · Feb 17, 2016 · 8e28ccf · 8e28ccf
2 parents e72b2b5 + 0396c8f
commit 8e28ccf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/android/titanium/src/java/org/appcelerator/titanium/proxy/TiViewProxy.java b/android/titanium/src/java/org/appcelerator/titanium/proxy/TiViewProxy.java
@@ -919,6 +919,12 @@ protected void handleFocus()
 		}
 	}
 
+	public TiBlob toImage()
+	{
+		//backward compat with maps
+		return toImage(null);
+	}
+
 	@Kroll.method
 	public TiBlob toImage(final @Kroll.argument(optional=true) KrollFunction callback)
 	{

diff --git a/android/titanium/src/java/org/appcelerator/titanium/view/TiUIFragment.java b/android/titanium/src/java/org/appcelerator/titanium/view/TiUIFragment.java
@@ -60,6 +60,11 @@ public Fragment getFragment()
 		return fragment;
 	}
 
+	public boolean handleMessage (Message msg) {
+		//overwriting so descendents don't have to
+		return true;
+	}
+
 	protected boolean interceptTouchEvent(MotionEvent ev)
 	{
 		return false;

diff --git a/.../module/packaged/ti.map-android-2.3.4.zip → .../module/packaged/ti.map-android-2.3.6.zip b/.../module/packaged/ti.map-android-2.3.4.zip → .../module/packaged/ti.map-android-2.3.6.zip