fix(android): amend resume timeout

tidev · Mar 25, 2019 · 9fd3517 · 9fd3517
1 parent e65d2a2
commit 9fd3517
Show file tree

Hide file tree

Showing 2 changed files with 2 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
@@ -156,7 +156,7 @@ public void run()
 					{
 						handleOpen(options);
 					}
-				}, 300);
+				}, Build.VERSION.SDK_INT > Build.VERSION_CODES.M ? 1 : 100);
 				return;
 			}
 		}

diff --git a/android/titanium/src/java/org/appcelerator/titanium/proxy/TiWindowProxy.java b/android/titanium/src/java/org/appcelerator/titanium/proxy/TiWindowProxy.java
@@ -661,6 +661,6 @@ protected Bundle createActivityOptionsBundle(Activity activity)
 	protected boolean hasActivityTransitions()
 	{
 		final boolean animated = TiConvert.toBoolean(getProperties(), TiC.PROPERTY_ANIMATED, true);
-		return (LOLLIPOP_OR_GREATER && animated && sharedElementPairs != null && !sharedElementPairs.isEmpty());
+		return LOLLIPOP_OR_GREATER && animated;
 	}
 }