[TIMOB-25678] Fix compatibility

tidev · Oct 24, 2018 · 47614be · 47614be
1 parent fe43726
commit 47614be
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java
@@ -161,7 +161,7 @@ protected void handleOpen(KrollDict options)
 			int exitAnimation = TiConvert.toInt(options.get(TiC.PROPERTY_ACTIVITY_EXIT_ANIMATION), 0);
 			topActivity.overridePendingTransition(enterAnimation, exitAnimation);
 		} else {
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN && Build.VERSION.SDK_INT != Build.VERSION_CODES.M) {
 				topActivity.startActivity(intent, createActivityOptionsBundle(topActivity));
 			} else {
 				topActivity.startActivity(intent);

diff --git a/android/titanium/src/java/org/appcelerator/titanium/proxy/TiWindowProxy.java b/android/titanium/src/java/org/appcelerator/titanium/proxy/TiWindowProxy.java
@@ -507,7 +507,13 @@ public void removeAllSharedElements()
 	protected Bundle createActivityOptionsBundle(Activity activity)
 	{
 		ActivityOptionsCompat options = null;
-		if (hasActivityTransitions() && sharedElementPairs != null && !sharedElementPairs.isEmpty()) {
+		if (hasActivityTransitions()) {
+
+			// NOTE: some versions of Android do not animate the window enter or exit transition
+			// without returning a valid bundle. If the activity has transitions; always return a bundle.
+			if (sharedElementPairs.isEmpty()) {
+				sharedElementPairs.add(new Pair<View, String>(new View(activity), "ti_compatibility_element"));
+			}
 			options = ActivityOptionsCompat.makeSceneTransitionAnimation(
 				activity, sharedElementPairs.toArray(new Pair[sharedElementPairs.size()]));
 		} else {