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

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

Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev

parents f7d650e8 599be3d0

api/current.txt

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

    method public void onDestroyView();

    method public void onDetach();

    method public android.view.LayoutInflater onGetLayoutInflater(android.os.Bundle);

    method public void onHiddenChanged(boolean);

    method public deprecated void onInflate(android.util.AttributeSet, android.os.Bundle);

    method public void onInflate(android.content.Context, android.util.AttributeSet, android.os.Bundle);
@@ -4763,6 +4764,7 @@ package android.app { 
    method public abstract android.app.FragmentManager.BackStackEntry getBackStackEntryAt(int);

    method public abstract int getBackStackEntryCount();

    method public abstract android.app.Fragment getFragment(android.os.Bundle, java.lang.String);

    method public abstract java.util.List<android.app.Fragment> getFragments();

    method public abstract android.app.Fragment getPrimaryNavigationFragment();

    method public void invalidateOptionsMenu();

    method public abstract boolean isDestroyed();

api/system-current.txt

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

    method public void onDestroyView();

    method public void onDetach();

    method public android.view.LayoutInflater onGetLayoutInflater(android.os.Bundle);

    method public void onHiddenChanged(boolean);

    method public deprecated void onInflate(android.util.AttributeSet, android.os.Bundle);

    method public void onInflate(android.content.Context, android.util.AttributeSet, android.os.Bundle);
@@ -4922,6 +4923,7 @@ package android.app { 
    method public abstract android.app.FragmentManager.BackStackEntry getBackStackEntryAt(int);

    method public abstract int getBackStackEntryCount();

    method public abstract android.app.Fragment getFragment(android.os.Bundle, java.lang.String);

    method public abstract java.util.List<android.app.Fragment> getFragments();

    method public abstract android.app.Fragment getPrimaryNavigationFragment();

    method public void invalidateOptionsMenu();

    method public abstract boolean isDestroyed();

api/test-current.txt

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

    method public void onDestroyView();

    method public void onDetach();

    method public android.view.LayoutInflater onGetLayoutInflater(android.os.Bundle);

    method public void onHiddenChanged(boolean);

    method public deprecated void onInflate(android.util.AttributeSet, android.os.Bundle);

    method public void onInflate(android.content.Context, android.util.AttributeSet, android.os.Bundle);
@@ -4775,6 +4776,7 @@ package android.app { 
    method public abstract android.app.FragmentManager.BackStackEntry getBackStackEntryAt(int);

    method public abstract int getBackStackEntryCount();

    method public abstract android.app.Fragment getFragment(android.os.Bundle, java.lang.String);

    method public abstract java.util.List<android.app.Fragment> getFragments();

    method public abstract android.app.Fragment getPrimaryNavigationFragment();

    method public void invalidateOptionsMenu();

    method public abstract boolean isDestroyed();

core/java/android/app/DialogFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -398,9 +398,9 @@ public class DialogFragment extends Fragment 


    /** @hide */

    @Override

    public LayoutInflater getLayoutInflater(Bundle savedInstanceState) {

    public LayoutInflater onGetLayoutInflater(Bundle savedInstanceState) {

        if (!mShowsDialog) {

            return super.getLayoutInflater(savedInstanceState);

            return super.onGetLayoutInflater(savedInstanceState);

        }



        mDialog = onCreateDialog(savedInstanceState);

core/java/android/app/Fragment.java

+9 −5
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.content.res.TypedArray; 
import android.os.Build;

import android.os.Build.VERSION_CODES;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.os.Parcel;

import android.os.Parcelable;
@@ -1357,11 +1356,16 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
    }



    /**

     * @hide Hack so that DialogFragment can make its Dialog before creating

     * its views, and the view construction can use the dialog's context for

     * inflation.  Maybe this should become a public API. Note sure.

     * Returns the LayoutInflater used to inflate Views of this Fragment. The default

     * implementation will throw an exception if the Fragment is not attached.

     *

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

     */

    public LayoutInflater getLayoutInflater(Bundle savedInstanceState) {

    public LayoutInflater onGetLayoutInflater(Bundle savedInstanceState) {

        if (mHost == null) {

            throw new IllegalStateException("onGetLayoutInflater() cannot be executed until the "

                    + "Fragment is attached to the FragmentManager.");

        }

        final LayoutInflater result = mHost.onGetLayoutInflater();

        if (mHost.onUseFragmentManagerInflaterFactory()) {

            getChildFragmentManager(); // Init if needed; use raw implementation below.