Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 27d805ea: Merge "Use activity transitions when launched from fragments." into lmp-preview-dev

Browse Source 
* commit '27d805ea6fb5aa3dbe46d4f8af86c46bce523760':
  Use activity transitions when launched from fragments.
This commit is contained in:
George Mount
2014-05-28 14:42:01 +00:00
committed by Android Git Automerger
parent 7a63a3d19d 1cc3e2e7a0
commit 854ed1c4e2
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/app/Activity.java
View File

@@ -4194,7 +4194,11 @@ public class Activity extends ContextThemeWrapper
*/
public void startActivityFromFragment(@NonNull Fragment fragment, Intent intent,
int requestCode) {
startActivityFromFragment(fragment, intent, requestCode, null);
Bundle options = null;
if (mWindow.hasFeature(Window.FEATURE_CONTENT_TRANSITIONS)) {
options = ActivityOptions.makeSceneTransitionAnimation(this).toBundle();
}
startActivityFromFragment(fragment, intent, requestCode, options);
}
/**
@@ -4219,6 +4223,9 @@ public class Activity extends ContextThemeWrapper
*/
public void startActivityFromFragment(@NonNull Fragment fragment, Intent intent,
int requestCode, @Nullable Bundle options) {
if (options != null) {
mActivityTransitionState.startExitOutTransition(this, options);
}
Instrumentation.ActivityResult ar =
mInstrumentation.execStartActivity(
this, mMainThread.getApplicationThread(), mToken, fragment,