Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(android)(8_0_X): Fixed bug where app launches without animation when launched with data intent #10651

Merged
merged 3 commits into from
Mar 22, 2019
Merged

fix(android)(8_0_X): Fixed bug where app launches without animation when launched with data intent #10651

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fb3f17
[TIMOB-26715] Android: Fixed bug where app launches without animation…
jquick-axway Jan 25, 2019
2d84540
Merge branch '8_0_X' into TIMOB-26715-8_0_X
Mar 20, 2019
6b616d1
Merge branch '8_0_X' into TIMOB-26715-8_0_X
Mar 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/titanium/src/java/org/appcelerator/titanium/TiLaunchActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ protected void onCreate(Bundle savedInstanceState)
}
startActivity(resumeIntent);
finish();
overridePendingTransition(0, 0);
overridePendingTransition(android.R.anim.fade_in, 0);
} else {
// Launch a new root activity instance with JSActivity's intent embedded within launch intent.
Intent mainIntent = getPackageManager().getLaunchIntentForPackage(getPackageName());
Expand All @@ -146,7 +146,7 @@ protected void onCreate(Bundle savedInstanceState)
mainIntent.putExtra(TiC.EXTRA_TI_NEW_INTENT, getIntent());
}
finish();
overridePendingTransition(0, 0);
overridePendingTransition(android.R.anim.fade_in, 0);
startActivity(mainIntent);
}
return;
Expand Down
6 changes: 3 additions & 3 deletions android/titanium/src/java/org/appcelerator/titanium/TiRootActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@ public void run()
// Destroy this activity before it is shown.
finish();

// Disable this activity's enter/exit animation. (Looks bad if we keep it.)
// Disable activity's exit animation. (Looks bad if we keep it on a Pixel XL.)
// Note: Must be done after calling finish() above.
overridePendingTransition(0, 0);
overridePendingTransition(android.R.anim.fade_in, 0);
return;
}

Expand All @@ -218,7 +218,7 @@ public void run()
this.isDuplicateInstance = true;
activityOnCreate(savedInstanceState);
finish();
overridePendingTransition(0, 0);
overridePendingTransition(android.R.anim.fade_in, 0);
final Intent relaunchIntent = isNotMainIntent ? mainIntent : newIntent;
if (isNotMainIntent && (newIntent != null)) {
// Embed this destroyed activity's intent within the new launch intent.
Expand Down