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

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

Merge "Optimize Fragment operations so that minimal work is done."

parents fbc27b1e eca8e221

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4671,6 +4671,7 @@ package android.app { 
    method public abstract android.app.FragmentTransaction remove(android.app.Fragment);

    method public abstract android.app.FragmentTransaction replace(int, android.app.Fragment);

    method public abstract android.app.FragmentTransaction replace(int, android.app.Fragment, java.lang.String);

    method public abstract android.app.FragmentTransaction setAllowOptimization(boolean);

    method public abstract android.app.FragmentTransaction setBreadCrumbShortTitle(int);

    method public abstract android.app.FragmentTransaction setBreadCrumbShortTitle(java.lang.CharSequence);

    method public abstract android.app.FragmentTransaction setBreadCrumbTitle(int);

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4816,6 +4816,7 @@ package android.app { 
    method public abstract android.app.FragmentTransaction remove(android.app.Fragment);

    method public abstract android.app.FragmentTransaction replace(int, android.app.Fragment);

    method public abstract android.app.FragmentTransaction replace(int, android.app.Fragment, java.lang.String);

    method public abstract android.app.FragmentTransaction setAllowOptimization(boolean);

    method public abstract android.app.FragmentTransaction setBreadCrumbShortTitle(int);

    method public abstract android.app.FragmentTransaction setBreadCrumbShortTitle(java.lang.CharSequence);

    method public abstract android.app.FragmentTransaction setBreadCrumbTitle(int);

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4674,6 +4674,7 @@ package android.app { 
    method public abstract android.app.FragmentTransaction remove(android.app.Fragment);

    method public abstract android.app.FragmentTransaction replace(int, android.app.Fragment);

    method public abstract android.app.FragmentTransaction replace(int, android.app.Fragment, java.lang.String);

    method public abstract android.app.FragmentTransaction setAllowOptimization(boolean);

    method public abstract android.app.FragmentTransaction setBreadCrumbShortTitle(int);

    method public abstract android.app.FragmentTransaction setBreadCrumbShortTitle(java.lang.CharSequence);

    method public abstract android.app.FragmentTransaction setBreadCrumbTitle(int);

core/java/android/app/BackStackRecord.java

+130 −142

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/Fragment.java

+9 −0
Original line number Diff line number Diff line
@@ -481,6 +481,12 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
    // If app has requested a specific animation, this is the one to use.

    int mNextAnim;



    // If app has requested a specific transition, this is the one to use.

    int mNextTransition;



    // If app has requested a specific transition style, this is the one to use.

    int mNextTransitionStyle;



    // The parent container of the fragment after dynamically added to UI.

    ViewGroup mContainer;
@@ -510,6 +516,9 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
    SharedElementCallback mEnterTransitionCallback = SharedElementCallback.NULL_CALLBACK;

    SharedElementCallback mExitTransitionCallback = SharedElementCallback.NULL_CALLBACK;



    // True if mHidden has been changed and the animation should be scheduled.

    boolean mHiddenChanged;



    /**

     * State information that has been retrieved from a fragment instance

     * through {@link FragmentManager#saveFragmentInstanceState(Fragment)