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

Commit c68c2b44 authored by Adam Powell's avatar Adam Powell Committed by android-build-merger
Browse files

Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev am:... 

Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev am: a6c0cc09 am: 46ca7d8c
am: bbb2c359

* commit 'bbb2c359':
  Add Fragment#onAttachFragment for parent fragments

Change-Id: I0561042957f8f150c5206cd5a3cfb3b2d5ce4035
parents fa150b5d bbb2c359

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -4430,6 +4430,7 @@ package android.app { 
    method public void onActivityResult(int, int, android.content.Intent);

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

    method public void onAttach(android.content.Context);

    method public void onAttach(android.content.Context);

    method public deprecated void onAttach(android.app.Activity);

    method public deprecated void onAttach(android.app.Activity);

    method public void onAttachFragment(android.app.Fragment);

    method public void onConfigurationChanged(android.content.res.Configuration);

    method public void onConfigurationChanged(android.content.res.Configuration);

    method public boolean onContextItemSelected(android.view.MenuItem);

    method public boolean onContextItemSelected(android.view.MenuItem);

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

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

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -4575,6 +4575,7 @@ package android.app { 
    method public void onActivityResult(int, int, android.content.Intent);

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

    method public void onAttach(android.content.Context);

    method public void onAttach(android.content.Context);

    method public deprecated void onAttach(android.app.Activity);

    method public deprecated void onAttach(android.app.Activity);

    method public void onAttachFragment(android.app.Fragment);

    method public void onConfigurationChanged(android.content.res.Configuration);

    method public void onConfigurationChanged(android.content.res.Configuration);

    method public boolean onContextItemSelected(android.view.MenuItem);

    method public boolean onContextItemSelected(android.view.MenuItem);

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

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

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -4431,6 +4431,7 @@ package android.app { 
    method public void onActivityResult(int, int, android.content.Intent);

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

    method public void onAttach(android.content.Context);

    method public void onAttach(android.content.Context);

    method public deprecated void onAttach(android.app.Activity);

    method public deprecated void onAttach(android.app.Activity);

    method public void onAttachFragment(android.app.Fragment);

    method public void onConfigurationChanged(android.content.res.Configuration);

    method public void onConfigurationChanged(android.content.res.Configuration);

    method public boolean onContextItemSelected(android.view.MenuItem);

    method public boolean onContextItemSelected(android.view.MenuItem);

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

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

core/java/android/app/Fragment.java

+12 −0
Original line number Original line Diff line number Diff line
@@ -1429,6 +1429,18 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
        mCalled = true;

        mCalled = true;

    }

    }





    /**

     * Called when a fragment is attached as a child of this fragment.

     *

     * <p>This is called after the attached fragment's <code>onAttach</code> and before

     * the attached fragment's <code>onCreate</code> if the fragment has not yet had a previous

     * call to <code>onCreate</code>.</p>

     *

     * @param childFragment child fragment being attached

     */

    public void onAttachFragment(Fragment childFragment) {

    }



    /**

    /**

     * Called when a fragment is first attached to its context.

     * Called when a fragment is first attached to its context.

     * {@link #onCreate(Bundle)} will be called after this.

     * {@link #onCreate(Bundle)} will be called after this.

core/java/android/app/FragmentManager.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -941,6 +941,8 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate 
                    }

                    }

                    if (f.mParentFragment == null) {

                    if (f.mParentFragment == null) {

                        mHost.onAttachFragment(f);

                        mHost.onAttachFragment(f);

                    } else {

                        f.mParentFragment.onAttachFragment(f);

                    }

                    }





                    if (!f.mRetaining) {

                    if (!f.mRetaining) {