Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4c4b666 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Remove old APIs." into honeycomb

parents c6d2a767 17b9b814

api/11.xml

+26 −140
Original line number Diff line number Diff line
@@ -28800,6 +28800,19 @@ 
<parameter name="request" type="android.app.DownloadManager.Request">

</parameter>

</method>

<method name="getMaxBytesOverMobile"

 return="java.lang.Long"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

</method>

<method name="getMimeTypeForDownloadedFile"

 return="java.lang.String"

 abstract="false"
@@ -28813,6 +28826,19 @@ 
<parameter name="id" type="long">

</parameter>

</method>

<method name="getRecommendedMaxBytesOverMobile"

 return="java.lang.Long"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

</method>

<method name="getUriForDownloadedFile"

 return="android.net.Uri"

 abstract="false"
@@ -30661,17 +30687,6 @@ 
 visibility="public"

>

</method>

<method name="countBackStackEntries"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

</method>

<method name="dump"

 return="void"

 abstract="true"
@@ -30741,19 +30756,6 @@ 
<parameter name="tag" type="java.lang.String">

</parameter>

</method>

<method name="getBackStackEntry"

 return="android.app.FragmentManager.BackStackEntry"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="index" type="int">

</parameter>

</method>

<method name="getBackStackEntryAt"

 return="android.app.FragmentManager.BackStackEntry"

 abstract="true"
@@ -30793,17 +30795,6 @@ 
<parameter name="key" type="java.lang.String">

</parameter>

</method>

<method name="openTransaction"

 return="android.app.FragmentTransaction"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

</method>

<method name="popBackStack"

 return="void"

 abstract="true"
@@ -31349,17 +31340,6 @@ 
 visibility="public"

>

</field>

<field name="TRANSIT_FRAGMENT_NEXT"

 type="int"

 transient="false"

 volatile="false"

 value="4099"

 static="true"

 final="true"

 deprecated="deprecated"

 visibility="public"

>

</field>

<field name="TRANSIT_FRAGMENT_OPEN"

 type="int"

 transient="false"
@@ -31371,17 +31351,6 @@ 
 visibility="public"

>

</field>

<field name="TRANSIT_FRAGMENT_PREV"

 type="int"

 transient="false"

 volatile="false"

 value="4099"

 static="true"

 final="true"

 deprecated="deprecated"

 visibility="public"

>

</field>

<field name="TRANSIT_NONE"

 type="int"

 transient="false"
@@ -44321,19 +44290,6 @@ 
 visibility="public"

>

</method>

<method name="getItem"

 return="android.content.ClipData.Item"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="index" type="int">

</parameter>

</method>

<method name="getItemAt"

 return="android.content.ClipData.Item"

 abstract="false"
@@ -44373,23 +44329,6 @@ 
<parameter name="intent" type="android.content.Intent">

</parameter>

</method>

<method name="newIntent"

 return="android.content.ClipData"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="label" type="java.lang.CharSequence">

</parameter>

<parameter name="icon" type="android.graphics.Bitmap">

</parameter>

<parameter name="intent" type="android.content.Intent">

</parameter>

</method>

<method name="newPlainText"

 return="android.content.ClipData"

 abstract="false"
@@ -44405,23 +44344,6 @@ 
<parameter name="text" type="java.lang.CharSequence">

</parameter>

</method>

<method name="newPlainText"

 return="android.content.ClipData"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="label" type="java.lang.CharSequence">

</parameter>

<parameter name="icon" type="android.graphics.Bitmap">

</parameter>

<parameter name="text" type="java.lang.CharSequence">

</parameter>

</method>

<method name="newRawUri"

 return="android.content.ClipData"

 abstract="false"
@@ -44437,23 +44359,6 @@ 
<parameter name="uri" type="android.net.Uri">

</parameter>

</method>

<method name="newRawUri"

 return="android.content.ClipData"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="label" type="java.lang.CharSequence">

</parameter>

<parameter name="icon" type="android.graphics.Bitmap">

</parameter>

<parameter name="uri" type="android.net.Uri">

</parameter>

</method>

<method name="newUri"

 return="android.content.ClipData"

 abstract="false"
@@ -44471,25 +44376,6 @@ 
<parameter name="uri" type="android.net.Uri">

</parameter>

</method>

<method name="newUri"

 return="android.content.ClipData"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="resolver" type="android.content.ContentResolver">

</parameter>

<parameter name="label" type="java.lang.CharSequence">

</parameter>

<parameter name="icon" type="android.graphics.Bitmap">

</parameter>

<parameter name="uri" type="android.net.Uri">

</parameter>

</method>

<method name="writeToParcel"

 return="void"

 abstract="false"

api/current.xml

+1 −141
Original line number Diff line number Diff line
@@ -30687,17 +30687,6 @@ 
 visibility="public"

>

</method>

<method name="countBackStackEntries"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

</method>

<method name="dump"

 return="void"

 abstract="true"
@@ -30767,19 +30756,6 @@ 
<parameter name="tag" type="java.lang.String">

</parameter>

</method>

<method name="getBackStackEntry"

 return="android.app.FragmentManager.BackStackEntry"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="index" type="int">

</parameter>

</method>

<method name="getBackStackEntryAt"

 return="android.app.FragmentManager.BackStackEntry"

 abstract="true"
@@ -30800,7 +30776,7 @@ 
 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 deprecated="not deprecated"

 visibility="public"

>

</method>
@@ -30819,17 +30795,6 @@ 
<parameter name="key" type="java.lang.String">

</parameter>

</method>

<method name="openTransaction"

 return="android.app.FragmentTransaction"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="popBackStack"

 return="void"

 abstract="true"
@@ -31375,17 +31340,6 @@ 
 visibility="public"

>

</field>

<field name="TRANSIT_FRAGMENT_NEXT"

 type="int"

 transient="false"

 volatile="false"

 value="4099"

 static="true"

 final="true"

 deprecated="deprecated"

 visibility="public"

>

</field>

<field name="TRANSIT_FRAGMENT_OPEN"

 type="int"

 transient="false"
@@ -31397,17 +31351,6 @@ 
 visibility="public"

>

</field>

<field name="TRANSIT_FRAGMENT_PREV"

 type="int"

 transient="false"

 volatile="false"

 value="4099"

 static="true"

 final="true"

 deprecated="deprecated"

 visibility="public"

>

</field>

<field name="TRANSIT_NONE"

 type="int"

 transient="false"
@@ -44347,19 +44290,6 @@ 
 visibility="public"

>

</method>

<method name="getItem"

 return="android.content.ClipData.Item"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="index" type="int">

</parameter>

</method>

<method name="getItemAt"

 return="android.content.ClipData.Item"

 abstract="false"
@@ -44399,23 +44329,6 @@ 
<parameter name="intent" type="android.content.Intent">

</parameter>

</method>

<method name="newIntent"

 return="android.content.ClipData"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="label" type="java.lang.CharSequence">

</parameter>

<parameter name="icon" type="android.graphics.Bitmap">

</parameter>

<parameter name="intent" type="android.content.Intent">

</parameter>

</method>

<method name="newPlainText"

 return="android.content.ClipData"

 abstract="false"
@@ -44431,23 +44344,6 @@ 
<parameter name="text" type="java.lang.CharSequence">

</parameter>

</method>

<method name="newPlainText"

 return="android.content.ClipData"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="label" type="java.lang.CharSequence">

</parameter>

<parameter name="icon" type="android.graphics.Bitmap">

</parameter>

<parameter name="text" type="java.lang.CharSequence">

</parameter>

</method>

<method name="newRawUri"

 return="android.content.ClipData"

 abstract="false"
@@ -44463,23 +44359,6 @@ 
<parameter name="uri" type="android.net.Uri">

</parameter>

</method>

<method name="newRawUri"

 return="android.content.ClipData"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="label" type="java.lang.CharSequence">

</parameter>

<parameter name="icon" type="android.graphics.Bitmap">

</parameter>

<parameter name="uri" type="android.net.Uri">

</parameter>

</method>

<method name="newUri"

 return="android.content.ClipData"

 abstract="false"
@@ -44497,25 +44376,6 @@ 
<parameter name="uri" type="android.net.Uri">

</parameter>

</method>

<method name="newUri"

 return="android.content.ClipData"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="resolver" type="android.content.ContentResolver">

</parameter>

<parameter name="label" type="java.lang.CharSequence">

</parameter>

<parameter name="icon" type="android.graphics.Bitmap">

</parameter>

<parameter name="uri" type="android.net.Uri">

</parameter>

</method>

<method name="writeToParcel"

 return="void"

 abstract="false"

core/java/android/app/FragmentManager.java

+1 −11
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public abstract class FragmentManager { 
     */

    public abstract FragmentTransaction beginTransaction();



    /** @deprecated Old API */

    /** @hide -- remove once prebuilts are in. */

    @Deprecated

    public FragmentTransaction openTransaction() {

        return beginTransaction();
@@ -232,22 +232,12 @@ public abstract class FragmentManager { 
     */

    public abstract int getBackStackEntryCount();



    @Deprecated

    public int countBackStackEntries() {

        return getBackStackEntryCount();

    }

    

    /**

     * Return the BackStackEntry at index <var>index</var> in the back stack;

     * entries start index 0 being the bottom of the stack.

     */

    public abstract BackStackEntry getBackStackEntryAt(int index);



    @Deprecated

    public BackStackEntry getBackStackEntry(int index) {

        return getBackStackEntryAt(index);

    }

    

    /**

     * Add a new listener for changes to the fragment back stack.

     */

core/java/android/app/FragmentTransaction.java

+0 −6
Original line number Diff line number Diff line
@@ -114,12 +114,6 @@ public abstract class FragmentTransaction { 
     * with it except that it is appearing or disappearing for some reason. */

    public static final int TRANSIT_FRAGMENT_FADE = 3 | TRANSIT_ENTER_MASK;



    // Temp compat.

    @Deprecated

    public static final int TRANSIT_FRAGMENT_NEXT = TRANSIT_FRAGMENT_FADE;

    @Deprecated

    public static final int TRANSIT_FRAGMENT_PREV = TRANSIT_FRAGMENT_FADE;

    

    /**

     * Set specific animation resources to run for the fragments that are

     * entering and exiting in this transaction.

core/java/android/content/ClipData.java

+0 −26
Original line number Diff line number Diff line
@@ -360,11 +360,6 @@ public class ClipData implements Parcelable { 
        return new ClipData(label, MIMETYPES_TEXT_PLAIN, item);

    }



    @Deprecated

    static public ClipData newPlainText(CharSequence label, Bitmap icon, CharSequence text) {

        return newPlainText(label, text);

    }



    /**

     * Create a new ClipData holding an Intent with MIME type

     * {@link ClipDescription#MIMETYPE_TEXT_INTENT}.
@@ -378,11 +373,6 @@ public class ClipData implements Parcelable { 
        return new ClipData(label, MIMETYPES_TEXT_INTENT, item);

    }



    @Deprecated

    static public ClipData newIntent(CharSequence label, Bitmap icon, Intent intent) {

        return newIntent(label, intent);

    }

    

    /**

     * Create a new ClipData holding a URI.  If the URI is a content: URI,

     * this will query the content provider for the MIME type of its data and
@@ -423,12 +413,6 @@ public class ClipData implements Parcelable { 
        return new ClipData(label, mimeTypes, item);

    }



    @Deprecated

    static public ClipData newUri(ContentResolver resolver, CharSequence label,

            Bitmap icon, Uri uri) {

        return newUri(resolver, label, uri);

    }

    

    /**

     * Create a new ClipData holding an URI with MIME type

     * {@link ClipDescription#MIMETYPE_TEXT_URILIST}.
@@ -445,11 +429,6 @@ public class ClipData implements Parcelable { 
        return new ClipData(label, MIMETYPES_TEXT_URILIST, item);

    }



    @Deprecated

    static public ClipData newRawUri(CharSequence label, Bitmap icon, Uri uri) {

        return newRawUri(label, uri);

    }

    

    /**

     * Return the {@link ClipDescription} associated with this data, describing

     * what it contains.
@@ -488,11 +467,6 @@ public class ClipData implements Parcelable { 
        return mItems.get(index);

    }



    @Deprecated

    public Item getItem(int index) {

        return getItemAt(index);

    }

    

    @Override

    public int describeContents() {

        return 0;