diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-11-08 10:52:37 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-08 10:52:37 -0800 |
| commit | bc4119a390754505327fd2b51187d69353b239f1 (patch) | |
| tree | 6f6382df87b3c1a473c75ce4d0c916c8816bb80a /api | |
| parent | c44960a1fa893369b81c725328ce902caee8d35b (diff) | |
| parent | ab36acb39941ce981dddda9f9cf4d2d23a56fd26 (diff) | |
| download | frameworks_base-bc4119a390754505327fd2b51187d69353b239f1.zip frameworks_base-bc4119a390754505327fd2b51187d69353b239f1.tar.gz frameworks_base-bc4119a390754505327fd2b51187d69353b239f1.tar.bz2 | |
Merge "Fixe some stuff."
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 52 |
1 files changed, 45 insertions, 7 deletions
diff --git a/api/current.xml b/api/current.xml index 5cad414..ef49855 100644 --- a/api/current.xml +++ b/api/current.xml @@ -28065,13 +28065,22 @@ </parameter> </method> </class> -<interface name="FragmentManager" +<class name="FragmentManager" + extends="java.lang.Object" abstract="true" static="false" final="false" deprecated="not deprecated" visibility="public" > +<constructor name="FragmentManager" + type="android.app.FragmentManager" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> <method name="addOnBackStackChangedListener" return="void" abstract="true" @@ -28262,7 +28271,7 @@ visibility="public" > </field> -</interface> +</class> <interface name="FragmentManager.BackStackEntry" abstract="true" static="true" @@ -28323,13 +28332,22 @@ > </method> </interface> -<interface name="FragmentTransaction" +<class name="FragmentTransaction" + extends="java.lang.Object" abstract="true" static="false" final="false" deprecated="not deprecated" visibility="public" > +<constructor name="FragmentTransaction" + type="android.app.FragmentTransaction" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> <method name="add" return="android.app.FragmentTransaction" abstract="true" @@ -28401,6 +28419,17 @@ visibility="public" > </method> +<method name="commitAllowingStateLoss" + return="int" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="disallowAddToBackStack" return="android.app.FragmentTransaction" abstract="true" @@ -28686,7 +28715,7 @@ visibility="public" > </field> -</interface> +</class> <class name="Instrumentation" extends="java.lang.Object" abstract="false" @@ -30281,13 +30310,22 @@ </parameter> </method> </class> -<interface name="LoaderManager" +<class name="LoaderManager" + extends="java.lang.Object" abstract="true" static="false" final="false" deprecated="not deprecated" visibility="public" > +<constructor name="LoaderManager" + type="android.app.LoaderManager" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> <method name="getLoader" return="android.content.Loader<D>" abstract="true" @@ -30348,7 +30386,7 @@ <parameter name="id" type="int"> </parameter> </method> -</interface> +</class> <interface name="LoaderManager.LoaderCallbacks" abstract="true" static="true" @@ -30392,7 +30430,7 @@ abstract="true" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <implements name="android.content.Loader.OnLoadCompleteListener"> |