Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 942fde14 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add the ability to postpone transitions."

parents d80812b8 86bfc666

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -4489,6 +4489,7 @@ package android.app { 
    method public void onTrimMemory(int);

    method public void onViewCreated(android.view.View, android.os.Bundle);

    method public void onViewStateRestored(android.os.Bundle);

    method public void postponeEnterTransition();

    method public void registerForContextMenu(android.view.View);

    method public final void requestPermissions(java.lang.String[], int);

    method public void setAllowEnterTransitionOverlap(boolean);
@@ -4514,6 +4515,7 @@ package android.app { 
    method public void startActivityForResult(android.content.Intent, int);

    method public void startActivityForResult(android.content.Intent, int, android.os.Bundle);

    method public void startIntentSenderForResult(android.content.IntentSender, int, android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException;

    method public void startPostponedEnterTransition();

    method public void unregisterForContextMenu(android.view.View);

  }

























api/system-current.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -4634,6 +4634,7 @@ package android.app {













    method public void onTrimMemory(int);















    method public void onViewCreated(android.view.View, android.os.Bundle);















    method public void onViewStateRestored(android.os.Bundle);













    method public void postponeEnterTransition();















    method public void registerForContextMenu(android.view.View);















    method public final void requestPermissions(java.lang.String[], int);















    method public void setAllowEnterTransitionOverlap(boolean);









@@ -4659,6 +4660,7 @@ package android.app {













    method public void startActivityForResult(android.content.Intent, int);















    method public void startActivityForResult(android.content.Intent, int, android.os.Bundle);















    method public void startIntentSenderForResult(android.content.IntentSender, int, android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException;













    method public void startPostponedEnterTransition();















    method public void unregisterForContextMenu(android.view.View);















  }







































api/test-current.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -4492,6 +4492,7 @@ package android.app {













    method public void onTrimMemory(int);















    method public void onViewCreated(android.view.View, android.os.Bundle);















    method public void onViewStateRestored(android.os.Bundle);













    method public void postponeEnterTransition();















    method public void registerForContextMenu(android.view.View);















    method public final void requestPermissions(java.lang.String[], int);















    method public void setAllowEnterTransitionOverlap(boolean);









@@ -4517,6 +4518,7 @@ package android.app {













    method public void startActivityForResult(android.content.Intent, int);















    method public void startActivityForResult(android.content.Intent, int, android.os.Bundle);















    method public void startIntentSenderForResult(android.content.IntentSender, int, android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException;













    method public void startPostponedEnterTransition();















    method public void unregisterForContextMenu(android.view.View);















  }







































core/java/android/app/BackStackRecord.java



+65
−889


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/app/Fragment.java



+351
−86


























File changed.
Preview size limit exceeded, changes collapsed.