diff options
| author | 2017-05-01 23:37:00 +0000 | |
|---|---|---|
| committer | 2017-05-01 23:37:00 +0000 | |
| commit | d1832d7bf8d4704a9d0a6b04cbed901439c9df0f (patch) | |
| tree | b71a3cad9852386620c932886d071025ce869615 | |
| parent | 84666dc643f2a44e9b8a5ca77e127364cf6f4356 (diff) | |
| parent | ba9b2ce254e507fe1fa51194236b9e41562fc91b (diff) | |
Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev
am: ba9b2ce254
Change-Id: I787a726517687d1cec60a0f96d3abef3229a5dcc
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/FragmentContainer.java | 2 |
4 files changed, 2 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 32f1db73c1b9..98f4be8b21b1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4695,7 +4695,6 @@ package android.app { public abstract class FragmentContainer { ctor public FragmentContainer(); - method public android.app.Fragment instantiate(android.content.Context, java.lang.String, android.os.Bundle); method public abstract <T extends android.view.View> T onFindViewById(int); method public abstract boolean onHasView(); } diff --git a/api/system-current.txt b/api/system-current.txt index 96b26254684b..9cb9aabf51b4 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4865,7 +4865,6 @@ package android.app { public abstract class FragmentContainer { ctor public FragmentContainer(); - method public android.app.Fragment instantiate(android.content.Context, java.lang.String, android.os.Bundle); method public abstract <T extends android.view.View> T onFindViewById(int); method public abstract boolean onHasView(); } diff --git a/api/test-current.txt b/api/test-current.txt index 40cc16e66a77..02c4c4a4e8cc 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -4708,7 +4708,6 @@ package android.app { public abstract class FragmentContainer { ctor public FragmentContainer(); - method public android.app.Fragment instantiate(android.content.Context, java.lang.String, android.os.Bundle); method public abstract <T extends android.view.View> T onFindViewById(int); method public abstract boolean onHasView(); } diff --git a/core/java/android/app/FragmentContainer.java b/core/java/android/app/FragmentContainer.java index 77c9c312ce24..f8836bc829a0 100644 --- a/core/java/android/app/FragmentContainer.java +++ b/core/java/android/app/FragmentContainer.java @@ -42,6 +42,8 @@ public abstract class FragmentContainer { * Creates an instance of the specified fragment, can be overridden to construct fragments * with dependencies, or change the fragment being constructed. By default just calls * {@link Fragment#instantiate(Context, String, Bundle)}. + * + * @hide */ public Fragment instantiate(Context context, String className, Bundle arguments) { return Fragment.instantiate(context, className, arguments); |