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

Commit 3fd81298 authored by George Mount's avatar George Mount
Browse files

Adds getLayoutInflater() to return a cached value. 

Bug 37156970

Many applications need to get the LayoutInflater used for
fragment View inflation. onGetLayoutInflater() can be heavy
weight, so a version that caches that last value is added.

Support Lib: I11d719d7416a5bb3b65f37a78e6ed96a69c32332
Test: I6aa0ecfe7136d133d15a597857f6cf6f3cf68fca

Change-Id: I686d5b39f7a046396fff124c33c22a73952ee5d7
parent dc2dd6ed

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4577,6 +4577,7 @@ package android.app { 
    method public final android.app.FragmentManager getFragmentManager();

    method public final java.lang.Object getHost();

    method public final int getId();

    method public final android.view.LayoutInflater getLayoutInflater();

    method public android.app.LoaderManager getLoaderManager();

    method public final android.app.Fragment getParentFragment();

    method public android.transition.Transition getReenterTransition();

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4744,6 +4744,7 @@ package android.app { 
    method public final android.app.FragmentManager getFragmentManager();

    method public final java.lang.Object getHost();

    method public final int getId();

    method public final android.view.LayoutInflater getLayoutInflater();

    method public android.app.LoaderManager getLoaderManager();

    method public final android.app.Fragment getParentFragment();

    method public android.transition.Transition getReenterTransition();

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4590,6 +4590,7 @@ package android.app { 
    method public final android.app.FragmentManager getFragmentManager();

    method public final java.lang.Object getHost();

    method public final int getId();

    method public final android.view.LayoutInflater getLayoutInflater();

    method public android.app.LoaderManager getLoaderManager();

    method public final android.app.Fragment getParentFragment();

    method public android.transition.Transition getReenterTransition();

core/java/android/app/Fragment.java

+37 −0
Original line number Diff line number Diff line
@@ -509,6 +509,10 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
    // True if mHidden has been changed and the animation should be scheduled.

    boolean mHiddenChanged;



    // The cached value from onGetLayoutInflater(Bundle) that will be returned from

    // getLayoutInflater()

    LayoutInflater mLayoutInflater;



    /**

     * State information that has been retrieved from a fragment instance

     * through {@link FragmentManager#saveFragmentInstanceState(Fragment)
@@ -1388,6 +1392,38 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
        return result;

    }



    /**

     * Returns the cached LayoutInflater used to inflate Views of this Fragment. If

     * {@link #onGetLayoutInflater(Bundle)} has not been called {@link #onGetLayoutInflater(Bundle)}

     * will be called with a {@code null} argument and that value will be cached.

     * <p>

     * The cached LayoutInflater will be replaced immediately prior to

     * {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)} and cleared immediately after

     * {@link #onDetach()}.

     *

     * @return The LayoutInflater used to inflate Views of this Fragment.

     */

    public final LayoutInflater getLayoutInflater() {

        if (mLayoutInflater == null) {

            return performGetLayoutInflater(null);

        }

        return mLayoutInflater;

    }



    /**

     * Calls {@link #onGetLayoutInflater(Bundle)} and caches the result for use by

     * {@link #getLayoutInflater()}.

     *

     * @param savedInstanceState If the fragment is being re-created from

     * a previous saved state, this is the state.

     * @return The LayoutInflater used to inflate Views of this Fragment.

     */

    LayoutInflater performGetLayoutInflater(Bundle savedInstanceState) {

        LayoutInflater layoutInflater = onGetLayoutInflater(savedInstanceState);

        mLayoutInflater = layoutInflater;

        return mLayoutInflater;

    }



    /**

     * @deprecated Use {@link #onInflate(Context, AttributeSet, Bundle)} instead.

     */
@@ -2835,6 +2871,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
    void performDetach() {

        mCalled = false;

        onDetach();

        mLayoutInflater = null;

        if (!mCalled) {

            throw new SuperNotCalledException("Fragment " + this

                    + " did not call through to super.onDetach()");

core/java/android/app/FragmentManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1259,7 +1259,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate 
                                }

                            }

                            f.mContainer = container;

                            f.mView = f.performCreateView(f.onGetLayoutInflater(

                            f.mView = f.performCreateView(f.performGetLayoutInflater(

                                    f.mSavedFragmentState), container, f.mSavedFragmentState);

                            if (f.mView != null) {

                                f.mView.setSaveFromParentEnabled(false);
@@ -1431,7 +1431,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate 


    void ensureInflatedFragmentView(Fragment f) {

        if (f.mFromLayout && !f.mPerformedCreateView) {

            f.mView = f.performCreateView(f.onGetLayoutInflater(

            f.mView = f.performCreateView(f.performGetLayoutInflater(

                    f.mSavedFragmentState), null, f.mSavedFragmentState);

            if (f.mView != null) {

                f.mView.setSaveFromParentEnabled(false);