diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-13 15:45:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-13 15:45:23 -0700 |
| commit | 28a8bce691358dca3872e65d3604f3b0ff3fccaf (patch) | |
| tree | 45cee1a9747ee6456c4f20b98cdf6b861e9b03ba /api | |
| parent | 0d9288d7848e144fdf7afbd7284254dae3d13d43 (diff) | |
| parent | 6824c135fe9639c74f38f125d678c20065c3347c (diff) | |
| download | frameworks_base-28a8bce691358dca3872e65d3604f3b0ff3fccaf.zip frameworks_base-28a8bce691358dca3872e65d3604f3b0ff3fccaf.tar.gz frameworks_base-28a8bce691358dca3872e65d3604f3b0ff3fccaf.tar.bz2 | |
am 6824c135: am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
* commit '6824c135fe9639c74f38f125d678c20065c3347c':
DO NOT MERGE. Integrate fragment work from master
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml index 4e7ebf6..855f843 100644 --- a/api/current.xml +++ b/api/current.xml @@ -30529,6 +30529,21 @@ visibility="public" > </method> +<method name="onViewCreated" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="view" type="android.view.View"> +</parameter> +<parameter name="savedInstanceState" type="android.os.Bundle"> +</parameter> +</method> <method name="registerForContextMenu" return="void" abstract="false" @@ -31262,6 +31277,19 @@ <parameter name="name" type="java.lang.String"> </parameter> </method> +<method name="attach" + return="android.app.FragmentTransaction" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="fragment" type="android.app.Fragment"> +</parameter> +</method> <method name="commit" return="int" abstract="true" @@ -31284,6 +31312,19 @@ visibility="public" > </method> +<method name="detach" + return="android.app.FragmentTransaction" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="fragment" type="android.app.Fragment"> +</parameter> +</method> <method name="disallowAddToBackStack" return="android.app.FragmentTransaction" abstract="true" |