From e30299f99018f6d1094df53bb48efa712e7a9221 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Fri, 13 May 2016 11:04:39 -0700
Subject: [PATCH] Add Fragment#onAttachFragment for parent fragments

Framework edition

Add a matching onAttachFragment method to Fragment to match the
fragment host version.

Bug 28760393

Change-Id: I5f50b3446449cae7110da6b4e468ee80f413e1e5
---
 api/current.txt                            |  1 +
 api/system-current.txt                     |  1 +
 api/test-current.txt                       |  1 +
 core/java/android/app/Fragment.java        | 12 ++++++++++++
 core/java/android/app/FragmentManager.java |  2 ++
 5 files changed, 17 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index e91d01751fbf1..b30ba6a77f5b2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -4430,6 +4430,7 @@ package android.app {
     method public void onActivityResult(int, int, android.content.Intent);
     method public void onAttach(android.content.Context);
     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 boolean onContextItemSelected(android.view.MenuItem);
     method public void onCreate(android.os.Bundle);
diff --git a/api/system-current.txt b/api/system-current.txt
index 87816631a33de..b49068c48c9a8 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4575,6 +4575,7 @@ package android.app {
     method public void onActivityResult(int, int, android.content.Intent);
     method public void onAttach(android.content.Context);
     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 boolean onContextItemSelected(android.view.MenuItem);
     method public void onCreate(android.os.Bundle);
diff --git a/api/test-current.txt b/api/test-current.txt
index 410eb88460181..1ce78c7245238 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -4431,6 +4431,7 @@ package android.app {
     method public void onActivityResult(int, int, android.content.Intent);
     method public void onAttach(android.content.Context);
     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 boolean onContextItemSelected(android.view.MenuItem);
     method public void onCreate(android.os.Bundle);
diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java
index 7ef6d414ed84d..a637ef4f9c549 100644
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -1429,6 +1429,18 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
         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.
      * {@link #onCreate(Bundle)} will be called after this.
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java
index 13b271681cf86..cd7665cf1163e 100644
--- a/core/java/android/app/FragmentManager.java
+++ b/core/java/android/app/FragmentManager.java
@@ -941,6 +941,8 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
                     }
                     if (f.mParentFragment == null) {
                         mHost.onAttachFragment(f);
+                    } else {
+                        f.mParentFragment.onAttachFragment(f);
                     }
 
                     if (!f.mRetaining) {