fix(android): prevent duplicate launch animation

tidev · Dec 21, 2019 · deb0106 · deb0106
1 parent f687e3b
commit deb0106
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiApplication.java b/android/titanium/src/java/org/appcelerator/titanium/TiApplication.java
@@ -161,6 +161,18 @@ public static TiApplication getInstance()
 		return tiApp;
 	}
 
+	/**
+	 * Determine if activity is first on stack.
+	 * @return boolean to determine if activity is first.
+	 */
+	public static boolean firstOnActivityStack()
+	{
+		if (activityStack.size() == 1) {
+			return true;
+		}
+		return false;
+	}
+
 	public static void addToActivityStack(Activity activity)
 	{
 		if (activity != null) {

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiLaunchActivity.java b/android/titanium/src/java/org/appcelerator/titanium/TiLaunchActivity.java
@@ -180,6 +180,12 @@ protected void onResume()
 			Log.d(TAG, "Launched in " + (SystemClock.uptimeMillis() - TiApplication.START_TIME_MS) + " ms");
 		}
 		super.onResume();
+
+		// Prevent duplicate launch animation.
+		// Windows opened before TiRootActivity has animated may cause an unwanted stutter animation.
+		if (TiApplication.firstOnActivityStack()) {
+			overridePendingTransition(0, 0);
+		}
 	}
 
 	@Override