From a60579e8f6abff88814d940f9da51e22788d6007 Mon Sep 17 00:00:00 2001
From: keyboardr <keyboardr@google.com>
Date: Mon, 26 Jun 2017 15:16:26 -0700
Subject: All Fragments are now support library Fragments.

Switch a bunch of imports to support library Fragments (and Loaders) instead of framework Fragments (and Loaders). This was needed to use FragmentManager.isStateSaved() instead of manually tracking that state. This should reduce errors around committing after state is saved.

Also adds METADATA presubmit to prevent new usages of framework Fragments or Loaders.

Bug: 38241305
Test: Covered by existing tests.
PiperOrigin-RevId: 160202511
Change-Id: I5dc0b467da984ca571e49b4dfa0deea44eb372b2
---
 .../dialer/common/concurrent/DefaultDialerExecutorFactory.java      | 2 +-
 .../com/android/dialer/common/concurrent/DialerExecutorFactory.java | 6 ++++--
 java/com/android/dialer/common/concurrent/DialerExecutors.java      | 2 +-
 java/com/android/dialer/common/concurrent/DialerUiTaskFragment.java | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'java/com/android/dialer/common')

diff --git a/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java b/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java
index 82e517d9a..5600abb47 100644
--- a/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java
+++ b/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java
@@ -16,10 +16,10 @@
 
 package com.android.dialer.common.concurrent;
 
-import android.app.FragmentManager;
 import android.os.AsyncTask;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentManager;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.Builder;
diff --git a/java/com/android/dialer/common/concurrent/DialerExecutorFactory.java b/java/com/android/dialer/common/concurrent/DialerExecutorFactory.java
index 82f8c7c3d..6a99fb0b2 100644
--- a/java/com/android/dialer/common/concurrent/DialerExecutorFactory.java
+++ b/java/com/android/dialer/common/concurrent/DialerExecutorFactory.java
@@ -16,8 +16,8 @@
 
 package com.android.dialer.common.concurrent;
 
-import android.app.FragmentManager;
 import android.support.annotation.NonNull;
+import android.support.v4.app.FragmentManager;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 
 /**
@@ -31,8 +31,10 @@ import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 public interface DialerExecutorFactory {
 
   /**
-   * Must be called from onCreate of your activity or fragment.
+   * Must be called from onCreate of your Activity or Fragment.
    *
+   * @param fragmentManager the FragmentManager owned by your Activity or Fragment (i.e. not the
+   *     FragmentManager that contains your Fragment)
    * @param taskId used for the headless fragment ID and task ID
    * @param worker a function executed on a worker thread which accepts an {@link InputT} and
    *     returns an {@link OutputT}. It should ideally not be an inner class of your (meaning it
diff --git a/java/com/android/dialer/common/concurrent/DialerExecutors.java b/java/com/android/dialer/common/concurrent/DialerExecutors.java
index 148d8660c..f1764c2a4 100644
--- a/java/com/android/dialer/common/concurrent/DialerExecutors.java
+++ b/java/com/android/dialer/common/concurrent/DialerExecutors.java
@@ -16,8 +16,8 @@
 
 package com.android.dialer.common.concurrent;
 
-import android.app.FragmentManager;
 import android.support.annotation.NonNull;
+import android.support.v4.app.FragmentManager;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 
diff --git a/java/com/android/dialer/common/concurrent/DialerUiTaskFragment.java b/java/com/android/dialer/common/concurrent/DialerUiTaskFragment.java
index 7f2a5a06b..300b39467 100644
--- a/java/com/android/dialer/common/concurrent/DialerUiTaskFragment.java
+++ b/java/com/android/dialer/common/concurrent/DialerUiTaskFragment.java
@@ -16,13 +16,13 @@
 
 package com.android.dialer.common.concurrent;
 
-import android.app.Fragment;
-import android.app.FragmentManager;
 import android.os.Bundle;
 import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.FailureListener;
-- 
cgit v1.2.3