summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorTodd Kennedy <toddke@google.com>2015-05-05 15:53:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-05 15:53:29 +0000
commit3266f60ba0c2a37883446cadbfc00bb8354824d0 (patch)
tree93384e13842b98b4a33f47015d8fe5347758a414 /api
parente02b7868c6c8f856a21f36569a77dab7f1cc7c78 (diff)
parent434bd65ca61ff5cec46fce9fbe866d8ee40579da (diff)
downloadframeworks_base-3266f60ba0c2a37883446cadbfc00bb8354824d0.zip
frameworks_base-3266f60ba0c2a37883446cadbfc00bb8354824d0.tar.gz
frameworks_base-3266f60ba0c2a37883446cadbfc00bb8354824d0.tar.bz2
Merge "Call Activity#onAttachFragment()" into mnc-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 07a4ff7..e3bb0b8 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -4495,6 +4495,7 @@ package android.app {
public abstract class FragmentHostCallback extends android.app.FragmentContainer {
ctor public FragmentHostCallback(android.content.Context, android.os.Handler, int);
+ method public void onAttachFragment(android.app.Fragment);
method public void onDump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
method public android.view.View onFindViewById(int);
method public abstract E onGetHost();
diff --git a/api/system-current.txt b/api/system-current.txt
index e068a40..535bfc7 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4587,6 +4587,7 @@ package android.app {
public abstract class FragmentHostCallback extends android.app.FragmentContainer {
ctor public FragmentHostCallback(android.content.Context, android.os.Handler, int);
+ method public void onAttachFragment(android.app.Fragment);
method public void onDump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
method public android.view.View onFindViewById(int);
method public abstract E onGetHost();