Deprecate Fragments

annotation/compiler/test/src/test/resources/EmptyAppGlideModuleTest/GlideApp.java

@@ -2,11 +2,11 @@
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.Fragment;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
+import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.view.View;
 import com.bumptech.glide.Glide;
@@ -115,8 +115,9 @@ public static GlideRequests with(@NonNull Fragment arg0) {
   /**
    * @see Glide#with(Fragment)
    */
+  @Deprecated
   @NonNull
-  public static GlideRequests with(@NonNull android.support.v4.app.Fragment arg0) {
+  public static GlideRequests with(@NonNull android.app.Fragment arg0) {
     return (GlideRequests) Glide.with(arg0);
   }
 

instrumentation/src/androidTest/java/com/bumptech/glide/DataUriTest.java

@@ -94,6 +94,7 @@ private String getDataUriString(CompressFormat format) {
     return "data:" + mimeType + ";base64," + bytes;
   }
 
+  @SuppressWarnings("deprecation")
   private String getBase64BitmapBytes(CompressFormat format) {
     ByteArrayOutputStream bos = new ByteArrayOutputStream();
     Drawable drawable = context.getResources().getDrawable(ResourceIds.raw.canonical);

integration/recyclerview/src/main/java/com/bumptech/glide/integration/recyclerview/RecyclerViewPreloader.java

@@ -1,8 +1,8 @@
 package com.bumptech.glide.integration.recyclerview;
 
 import android.app.Activity;
-import android.app.Fragment;
 import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v7.widget.RecyclerView;
 import com.bumptech.glide.Glide;
@@ -62,9 +62,12 @@ public RecyclerViewPreloader(@NonNull Fragment fragment,
   }
 
   /**
-   * Helper constructor that accepts an {@link android.support.v4.app.Fragment}.
+   * Helper constructor that accepts an {@link android.app.Fragment}.
+   * @deprecated Use constructor <code>RecyclerViewPreloader(Fragment, PreloadModelProvider<T>,
+   * PreloadSizeProvider<T>)</code> instead.
    */
-  public RecyclerViewPreloader(@NonNull android.support.v4.app.Fragment fragment,
+  @Deprecated
+  public RecyclerViewPreloader(@NonNull android.app.Fragment fragment,
       @NonNull PreloadModelProvider<T> preloadModelProvider,
       @NonNull PreloadSizeProvider<T> preloadDimensionProvider,
       int maxPreload) {

library/src/main/java/com/bumptech/glide/Glide.java

@@ -724,27 +724,29 @@ public static RequestManager with(@NonNull FragmentActivity activity) {
   }
 
   /**
-   * Begin a load with Glide that will be tied to the given {@link android.app.Fragment}'s lifecycle
-   * and that uses the given {@link android.app.Fragment}'s default options.
+   * Begin a load with Glide that will be tied to the given
+   * {@link android.support.v4.app.Fragment}'s lifecycle and that uses the given
+   * {@link android.support.v4.app.Fragment}'s default options.
    *
    * @param fragment The fragment to use.
    * @return A RequestManager for the given Fragment that can be used to start a load.
    */
   @NonNull
-  public static RequestManager with(@NonNull android.app.Fragment fragment) {
+  public static RequestManager with(@NonNull Fragment fragment) {
     return getRetriever(fragment.getActivity()).get(fragment);
   }
 
   /**
-   * Begin a load with Glide that will be tied to the given
-   * {@link android.support.v4.app.Fragment}'s lifecycle and that uses the given
-   * {@link android.support.v4.app.Fragment}'s default options.
+   * Begin a load with Glide that will be tied to the given {@link android.app.Fragment}'s lifecycle
+   * and that uses the given {@link android.app.Fragment}'s default options.
    *
    * @param fragment The fragment to use.
    * @return A RequestManager for the given Fragment that can be used to start a load.
+   * @deprecated Use method {@link #with(Fragment)} instead.
    */
+  @Deprecated
   @NonNull
-  public static RequestManager with(@NonNull Fragment fragment) {
+  public static RequestManager with(@NonNull android.app.Fragment fragment) {
     return getRetriever(fragment.getActivity()).get(fragment);
   }
 

library/src/main/java/com/bumptech/glide/manager/RequestManagerFragment.java

@@ -25,6 +25,7 @@
  * @see com.bumptech.glide.manager.RequestManagerRetriever
  * @see com.bumptech.glide.RequestManager
  */
+@Deprecated
 public class RequestManagerFragment extends Fragment {
   private static final String TAG = "RMFragment";
   private final ActivityFragmentLifecycle lifecycle;

library/src/main/java/com/bumptech/glide/manager/RequestManagerRetriever.java

@@ -53,6 +53,7 @@ public class RequestManagerRetriever implements Handler.Callback {
   /**
    * Pending adds for RequestManagerFragments.
    */
+  @SuppressWarnings("deprecation")
   @VisibleForTesting
   final Map<android.app.FragmentManager, RequestManagerFragment> pendingRequestManagerFragments =
       new HashMap<>();
@@ -229,6 +230,8 @@ private Fragment findSupportFragment(@NonNull View target, @NonNull FragmentActi
     return result;
   }
 
+  @SuppressWarnings("deprecation")
+  @Deprecated
   @Nullable
   private android.app.Fragment findFragment(@NonNull View target, @NonNull Activity activity) {
     tempViewToFragment.clear();
@@ -255,6 +258,8 @@ private android.app.Fragment findFragment(@NonNull View target, @NonNull Activit
 
   // TODO: Consider using an accessor class in the support library package to more directly retrieve
   // non-support Fragments.
+  @SuppressWarnings("deprecation")
+  @Deprecated
   @TargetApi(Build.VERSION_CODES.O)
   private void findAllFragmentsWithViews(
       @NonNull android.app.FragmentManager fragmentManager,
@@ -271,6 +276,8 @@ private void findAllFragmentsWithViews(
     }
   }
 
+  @SuppressWarnings("deprecation")
+  @Deprecated
   private void findAllFragmentsWithViewsPreO(
       @NonNull android.app.FragmentManager fragmentManager,
       @NonNull ArrayMap<View, android.app.Fragment> result) {
@@ -313,6 +320,8 @@ private static void assertNotDestroyed(@NonNull Activity activity) {
     }
   }
 
+  @SuppressWarnings("deprecation")
+  @Deprecated
   @NonNull
   @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
   public RequestManager get(@NonNull android.app.Fragment fragment) {
@@ -328,6 +337,8 @@ public RequestManager get(@NonNull android.app.Fragment fragment) {
     }
   }
 
+  @SuppressWarnings("deprecation")
+  @Deprecated
   @NonNull
   RequestManagerFragment getRequestManagerFragment(
       @NonNull final android.app.FragmentManager fm, @Nullable android.app.Fragment parentHint) {
@@ -345,6 +356,8 @@ RequestManagerFragment getRequestManagerFragment(
     return current;
   }
 
+  @SuppressWarnings("deprecation")
+  @Deprecated
   @NonNull
   private RequestManager fragmentGet(@NonNull Context context,
       @NonNull android.app.FragmentManager fm,

library/test/src/test/java/com/bumptech/glide/manager/RequestManagerFragmentTest.java

@@ -148,6 +148,7 @@ private interface Harness {
     void onTrimMemory(@SuppressWarnings("SameParameterValue") int level);
   }
 
+  @SuppressWarnings("deprecation")
   private static class RequestManagerHarness implements Harness {
     private final ActivityController<Activity> controller;
     private final RequestManagerFragment fragment;

library/test/src/test/java/com/bumptech/glide/manager/RequestManagerRetrieverTest.java

@@ -134,6 +134,7 @@ public void testSupportCanGetRequestManagerFromActivity() {
     assertEquals(manager, retriever.get(fragmentActivity));
   }
 
+  @SuppressWarnings("deprecation")
   @Test
   public void testCanGetRequestManagerFromFragment() {
     Activity activity = Robolectric.buildActivity(Activity.class).create().start().resume().get();
@@ -168,6 +169,7 @@ public void testCanGetRequestManagerFromDetachedFragment_PreJellyBeanMr1() {
     helpTestCanGetRequestManagerFromDetachedFragment();
   }
 
+  @SuppressWarnings("deprecation")
   private void helpTestCanGetRequestManagerFromDetachedFragment() {
     Activity activity = Robolectric.buildActivity(Activity.class).create().start().resume().get();
     android.app.Fragment fragment = new android.app.Fragment();
@@ -202,6 +204,7 @@ private void helpTestSupportCanGetRequestManagerFromDetachedFragment() {
     retriever.get(fragment);
   }
 
+  @SuppressWarnings("deprecation")
   @Test(expected = IllegalArgumentException.class)
   public void testThrowsIfFragmentNotAttached() {
     android.app.Fragment fragment = new android.app.Fragment();
@@ -319,6 +322,7 @@ public void testDoesNotThrowIfAskedToGetManagerForActivityPreJellYBeanMr1() {
     assertNotNull(retriever.get(spyActivity));
   }
 
+  @SuppressWarnings("deprecation")
   @Test
   @RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
   public void testDoesNotThrowIfAskedToGetManagerForFragmentPreJellyBeanMr1() {
@@ -376,6 +380,7 @@ public boolean hasFragmentWithTag(String tag) {
           .findFragmentByTag(RequestManagerRetriever.FRAGMENT_TAG);
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public void addFragmentWithTag(String tag, RequestManager requestManager) {
       RequestManagerFragment fragment = new RequestManagerFragment();