[Android] Use support library fragments in FRE and sign-in

This CL migrates FirstRun and sign-in activities to support library
fragments (android.support.v4.app.Fragment instead of
android.app.Fragment).
Rationale for this migration:
1. Framework version of fragments are getting deprecated in Android P.
2. Enables use of getChildFragmentManager, getParentFragment, etc., on
all API versions.

Bug: 825789
Change-Id: I2079f211b03e4df1d169c1568d764763bb677bd1
Reviewed-on: https://chromium-review.googlesource.com/980335Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545853}

chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java

@@ -4,8 +4,9 @@
 
 package org.chromium.chrome.browser.firstrun;
 
-import android.app.Fragment;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -118,4 +119,9 @@ public class AccountFirstRunFragment
         mView.cancelConfirmationScreen();
         return true;
     }
+
+    @Override
+    public FragmentManager getSupportFragmentManager() {
+        return getFragmentManager();
+    }
 }

chrome/android/java/src/org/chromium/chrome/browser/firstrun/DataReductionProxyFirstRunFragment.java

@@ -4,8 +4,8 @@
 
 package org.chromium.chrome.browser.firstrun;
 
-import android.app.Fragment;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.support.v7.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;

chrome/android/java/src/org/chromium/chrome/browser/firstrun/DefaultSearchEngineFirstRunFragment.java

@@ -4,8 +4,8 @@
 
 package org.chromium.chrome.browser.firstrun;
 
-import android.app.Fragment;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java

@@ -5,10 +5,10 @@
 package org.chromium.chrome.browser.firstrun;
 
 import android.app.Activity;
-import android.app.Fragment;
 import android.os.Bundle;
 import android.support.annotation.CallSuper;
 import android.support.annotation.StringRes;
+import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.view.View;
 
@@ -222,7 +222,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
                     return;
                 }
 
-                mPagerAdapter = new FirstRunPagerAdapter(getFragmentManager(), mPages);
+                mPagerAdapter = new FirstRunPagerAdapter(getSupportFragmentManager(), mPages);
                 stopProgressionIfNotAcceptedTermsOfService();
                 mPager.setAdapter(mPagerAdapter);
 

chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFragment.java

@@ -4,8 +4,8 @@
 
 package org.chromium.chrome.browser.firstrun;
 
-import android.app.Activity;
-import android.app.Fragment;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
 
 /**
  * This interface is implemented by FRE fragments.
@@ -26,7 +26,7 @@ public interface FirstRunFragment {
     /**
      * @see Fragment#getActivity().
      */
-    Activity getActivity();
+    FragmentActivity getActivity();
 
     /**
      * Convenience method to get {@link FirstRunPageDelegate}.

chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunPage.java

@@ -4,7 +4,7 @@
 
 package org.chromium.chrome.browser.firstrun;
 
-import android.app.Fragment;
+import android.support.v4.app.Fragment;
 
 /**
  * Represents first run page shown during the First Run. Actual page implementation is created

chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunPagerAdapter.java

@@ -4,9 +4,9 @@
 
 package org.chromium.chrome.browser.firstrun;
 
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.support.v13.app.FragmentStatePagerAdapter;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
 
 import java.util.List;
 

chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java

@@ -4,8 +4,8 @@
 
 package org.chromium.chrome.browser.firstrun;
 
-import android.app.Fragment;
 import android.content.SharedPreferences;
+import android.support.v4.app.Fragment;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.browser.metrics.UmaSessionStats;

chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java

@@ -4,8 +4,8 @@
 
 package org.chromium.chrome.browser.firstrun;
 
-import android.app.Fragment;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;

chrome/android/java/src/org/chromium/chrome/browser/signin/AccountAdder.java

@@ -5,9 +5,9 @@
 package org.chromium.chrome.browser.signin;
 
 import android.app.Activity;
-import android.app.Fragment;
 import android.content.Intent;
 import android.provider.Settings;
+import android.support.v4.app.Fragment;
 import android.support.v7.app.AlertDialog;
 
 import org.chromium.base.VisibleForTesting;

chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java

@@ -26,6 +26,7 @@ import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentActivity;
 import android.widget.ListView;
 
 import org.chromium.base.ApiCompatibilityUtils;
@@ -236,9 +237,14 @@ public class AccountManagementFragment extends PreferenceFragment
                     String managementDomain = SigninManager.get().getManagementDomain();
                     if (managementDomain != null) {
                         // Show the 'You are signing out of a managed account' dialog.
+
+                        // TODO(https://crbug.com/710657): Migrate to AccountManagementFragment to
+                        // extend android.support.v7.preference.Preference and remove this cast.
+                        FragmentActivity fragmentActivity = (FragmentActivity) getActivity();
                         ConfirmManagedSyncDataDialog.showSignOutFromManagedAccountDialog(
-                                AccountManagementFragment.this, getFragmentManager(),
-                                getResources(), managementDomain);
+                                AccountManagementFragment.this,
+                                fragmentActivity.getSupportFragmentManager(), getResources(),
+                                managementDomain);
                     } else {
                         // Show the 'You are signing out' dialog.
                         SignOutDialogFragment signOutFragment = new SignOutDialogFragment();

chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java

@@ -5,12 +5,12 @@
 package org.chromium.chrome.browser.signin;
 
 import android.app.Activity;
-import android.app.FragmentManager;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.support.annotation.IntDef;
 import android.support.annotation.StringRes;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.app.AlertDialog;
 import android.text.method.LinkMovementMethod;
@@ -94,11 +94,11 @@ public class AccountSigninView extends FrameLayout {
 
         /**
          * Provides a FragmentManager for the View to create dialogs. This is done through a
-         * different mechanism than getActivity().getFragmentManager() as a potential fix to
-         * https://crbug.com/646978 on the theory that getActivity() and getFragmentManager()
+         * different mechanism than getActivity().getSupportFragmentManager() as a potential fix to
+         * https://crbug.com/646978 on the theory that getActivity() and getSupportFragmentManager()
          * return null at different times.
          */
-        FragmentManager getFragmentManager();
+        FragmentManager getSupportFragmentManager();
     }
 
     private static final String TAG = "AccountSigninView";
@@ -421,7 +421,7 @@ public class AccountSigninView extends FrameLayout {
         if (!ViewCompat.isAttachedToWindow(AccountSigninView.this)) {
             // This callback is invoked after AccountSigninView is detached from window
             // (e.g., Chrome is minimized). Updating view now is redundant and dangerous
-            // (getFragmentManager() can return null, etc.). See https://crbug.com/733117.
+            // (getSupportFragmentManager() can return null, etc.). See https://crbug.com/733117.
             return;
         }
 
@@ -669,7 +669,7 @@ public class AccountSigninView extends FrameLayout {
 
     private void runStateMachineAndShowConfirmationPage() {
         mConfirmSyncDataStateMachine = new ConfirmSyncDataStateMachine(getContext(),
-                mDelegate.getFragmentManager(), ImportSyncType.PREVIOUS_DATA_FOUND,
+                mDelegate.getSupportFragmentManager(), ImportSyncType.PREVIOUS_DATA_FOUND,
                 PrefServiceBridge.getInstance().getSyncLastAccountName(), mSelectedAccountName,
                 new ConfirmImportSyncDataDialog.Listener() {
                     @Override

chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmImportSyncDataDialog.java

@@ -5,11 +5,11 @@
 package org.chromium.chrome.browser.signin;
 
 import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;

chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmManagedSyncDataDialog.java

@@ -5,12 +5,12 @@
 package org.chromium.chrome.browser.signin;
 
 import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AlertDialog;
 
 import org.chromium.base.VisibleForTesting;

chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmSyncDataStateMachine.java

@@ -4,12 +4,12 @@
 
 package org.chromium.chrome.browser.signin;
 
-import android.app.DialogFragment;
-import android.app.FragmentManager;
 import android.content.Context;
 import android.os.Handler;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.FragmentManager;
 import android.text.TextUtils;
 
 import org.chromium.base.ThreadUtils;

chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmSyncDataStateMachineDelegate.java

@@ -5,11 +5,11 @@
 package org.chromium.chrome.browser.signin;
 
 import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AlertDialog;
 
 import org.chromium.chrome.R;

chrome/android/java/src/org/chromium/chrome/browser/sync/SyncAccountSwitcher.java

@@ -4,9 +4,9 @@
 
 package org.chromium.chrome.browser.sync;
 
-import android.app.Activity;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
+import android.support.v4.app.FragmentActivity;
 import android.text.TextUtils;
 
 import org.chromium.base.Callback;
@@ -34,7 +34,7 @@ public class SyncAccountSwitcher
     private static final String TAG = "SyncAccountSwitcher";
 
     private final SyncedAccountPreference mSyncedAccountPreference;
-    private final Activity mActivity;
+    private final FragmentActivity mActivity;
 
     private String mNewAccountName;
 
@@ -44,7 +44,8 @@ public class SyncAccountSwitcher
      *                 for the data sync fragment.
      * @param syncedAccountPreference The preference to update once signin has been completed.
      */
-    public SyncAccountSwitcher(Activity activity, SyncedAccountPreference syncedAccountPreference) {
+    public SyncAccountSwitcher(
+            FragmentActivity activity, SyncedAccountPreference syncedAccountPreference) {
         mActivity = activity;
         mSyncedAccountPreference = syncedAccountPreference;
     }
@@ -58,7 +59,7 @@ public class SyncAccountSwitcher
 
         if (TextUtils.equals(mNewAccountName, currentAccount)) return false;
 
-        new ConfirmSyncDataStateMachine(mActivity, mActivity.getFragmentManager(),
+        new ConfirmSyncDataStateMachine(mActivity, mActivity.getSupportFragmentManager(),
                 ImportSyncType.SWITCHING_SYNC_ACCOUNTS, currentAccount, mNewAccountName, this);
 
         // Don't update the selected account in the preference. It will be updated by

chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java

@@ -22,6 +22,7 @@ import android.preference.PreferenceFragment;
 import android.preference.SwitchPreference;
 import android.provider.Settings;
 import android.support.annotation.IntDef;
+import android.support.v4.app.FragmentActivity;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
@@ -210,8 +211,12 @@ public class SyncCustomizationFragment extends PreferenceFragment
 
         mSyncedAccountPreference =
                 (SyncedAccountPreference) findPreference(PREFERENCE_SYNC_ACCOUNT_LIST);
+
+        // TODO(https://crbug.com/710657): Migrate to SyncCustomizationFragment to
+        // extend android.support.v7.preference.Preference and remove this cast.
+        FragmentActivity fragmentActivity = (FragmentActivity) getActivity();
         mSyncedAccountPreference.setOnPreferenceChangeListener(
-                new SyncAccountSwitcher(getActivity(), mSyncedAccountPreference));
+                new SyncAccountSwitcher(fragmentActivity, mSyncedAccountPreference));
 
         return view;
     }