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

Commit 19bb58eb authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by Automerger Merge Worker
Browse files

Merge "Clean up old references to android.support in Activity and Fragment"... 

Merge "Clean up old references to android.support in Activity and Fragment" into rvc-dev-plus-aosp am: 47029fe4 am: 87e64b56

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12039663

Change-Id: Icdc075a521564adecb5e28887fb068e951b8b3a4
parents 6992a52e 87e64b56

core/java/android/app/Activity.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -220,8 +220,8 @@ import java.util.function.Consumer; 
 * <a name="Fragments"></a>

 * <a name="Fragments"></a>

 * <h3>Fragments</h3>

 * <h3>Fragments</h3>

 *

 *

 * <p>The {@link android.support.v4.app.FragmentActivity} subclass

 * <p>The {@link androidx.fragment.app.FragmentActivity} subclass

 * can make use of the {@link android.support.v4.app.Fragment} class to better

 * can make use of the {@link androidx.fragment.app.Fragment} class to better

 * modularize their code, build more sophisticated user interfaces for larger

 * modularize their code, build more sophisticated user interfaces for larger

 * screens, and help scale their application between small and large screens.</p>

 * screens, and help scale their application between small and large screens.</p>

 *

 *
@@ -1100,7 +1100,7 @@ public class Activity extends ContextThemeWrapper 
    /**

    /**

     * Return the LoaderManager for this activity, creating it if needed.

     * Return the LoaderManager for this activity, creating it if needed.

     *

     *

     * @deprecated Use {@link android.support.v4.app.FragmentActivity#getSupportLoaderManager()}

     * @deprecated Use {@link androidx.fragment.app.FragmentActivity#getSupportLoaderManager()}

     */

     */

    @Deprecated

    @Deprecated

    public LoaderManager getLoaderManager() {

    public LoaderManager getLoaderManager() {
@@ -3159,7 +3159,7 @@ public class Activity extends ContextThemeWrapper 
     * Return the FragmentManager for interacting with fragments associated

     * Return the FragmentManager for interacting with fragments associated

     * with this activity.

     * with this activity.

     *

     *

     * @deprecated Use {@link android.support.v4.app.FragmentActivity#getSupportFragmentManager()}

     * @deprecated Use {@link androidx.fragment.app.FragmentActivity#getSupportFragmentManager()}

     */

     */

    @Deprecated

    @Deprecated

    public FragmentManager getFragmentManager() {

    public FragmentManager getFragmentManager() {
@@ -3172,7 +3172,7 @@ public class Activity extends ContextThemeWrapper 
     * method and before {@link Fragment#onCreate Fragment.onCreate()}.

     * method and before {@link Fragment#onCreate Fragment.onCreate()}.

     *

     *

     * @deprecated Use {@link

     * @deprecated Use {@link

     * android.support.v4.app.FragmentActivity#onAttachFragment(android.support.v4.app.Fragment)}

     * androidx.fragment.app.FragmentActivity#onAttachFragment(androidx.fragment.app.Fragment)}

     */

     */

    @Deprecated

    @Deprecated

    public void onAttachFragment(Fragment fragment) {

    public void onAttachFragment(Fragment fragment) {

core/java/android/app/Fragment.java

+6 −6
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ import java.lang.reflect.InvocationTargetException; 
 * While the Fragment API was introduced in

 * While the Fragment API was introduced in

 * {@link android.os.Build.VERSION_CODES#HONEYCOMB}, a version of the API

 * {@link android.os.Build.VERSION_CODES#HONEYCOMB}, a version of the API

 * at is also available for use on older platforms through

 * at is also available for use on older platforms through

 * {@link android.support.v4.app.FragmentActivity}.  See the blog post

 * {@link androidx.fragment.app.FragmentActivity}.  See the blog post

 * <a href="http://android-developers.blogspot.com/2011/03/fragments-for-all.html">

 * <a href="http://android-developers.blogspot.com/2011/03/fragments-for-all.html">

 * Fragments For All</a> for more details.

 * Fragments For All</a> for more details.

 *

 *
@@ -258,8 +258,8 @@ import java.lang.reflect.InvocationTargetException; 
 * pressing back will pop it to return the user to whatever previous state

 * pressing back will pop it to return the user to whatever previous state

 * the activity UI was in.

 * the activity UI was in.

 *

 *

 * @deprecated Use the <a href="{@docRoot}tools/extras/support-library.html">Support Library</a>

 * @deprecated Use the <a href="{@docRoot}jetpack">Jetpack Fragment Library</a>

 *      {@link android.support.v4.app.Fragment} for consistent behavior across all devices

 *      {@link androidx.fragment.app.Fragment} for consistent behavior across all devices

 *      and access to <a href="{@docRoot}topic/libraries/architecture/lifecycle.html">Lifecycle</a>.

 *      and access to <a href="{@docRoot}topic/libraries/architecture/lifecycle.html">Lifecycle</a>.

 */

 */

@Deprecated

@Deprecated
@@ -432,7 +432,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
     * through {@link FragmentManager#saveFragmentInstanceState(Fragment)

     * through {@link FragmentManager#saveFragmentInstanceState(Fragment)

     * FragmentManager.saveFragmentInstanceState}.

     * FragmentManager.saveFragmentInstanceState}.

     *

     *

     * @deprecated Use {@link android.support.v4.app.Fragment.SavedState}

     * @deprecated Use {@link androidx.fragment.app.Fragment.SavedState}

     */

     */

    @Deprecated

    @Deprecated

    public static class SavedState implements Parcelable {

    public static class SavedState implements Parcelable {
@@ -479,7 +479,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
     * Thrown by {@link Fragment#instantiate(Context, String, Bundle)} when

     * Thrown by {@link Fragment#instantiate(Context, String, Bundle)} when

     * there is an instantiation failure.

     * there is an instantiation failure.

     *

     *

     * @deprecated Use {@link android.support.v4.app.Fragment.InstantiationException}

     * @deprecated Use {@link androidx.fragment.app.Fragment.InstantiationException}

     */

     */

    @Deprecated

    @Deprecated

    static public class InstantiationException extends AndroidRuntimeException {

    static public class InstantiationException extends AndroidRuntimeException {
@@ -1055,7 +1055,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
    /**

    /**

     * Return the LoaderManager for this fragment, creating it if needed.

     * Return the LoaderManager for this fragment, creating it if needed.

     *

     *

     * @deprecated Use {@link android.support.v4.app.Fragment#getLoaderManager()}

     * @deprecated Use {@link androidx.fragment.app.Fragment#getLoaderManager()}

     */

     */

    @Deprecated

    @Deprecated

    public LoaderManager getLoaderManager() {

    public LoaderManager getLoaderManager() {