Settings Fragment Migration (Change imports)

This commit *only* changes imports and optimize imports.
We don't do anything else.

This patch can't compile pass and run test case.
We will update other patches to fix these problem.

Change list.

1. import android.app.Fragment; ->
   import androidx.fragment.app.Fragment;
2. import android.app.DialogFragment; ->
   import androidx.fragment.app.DialogFragment;
3. import android.app.ListFragment; ->
   import androidx.fragment.app.ListFragment;
4. import android.app.LoaderManager; ->
   import androidx.loader.app.LoaderManager;
5. import android.content.AsyncTaskLoader; ->
   import androidx.loader.content.AsyncTaskLoader;
6. import android.content.Loader; ->
   import androidx.loader.content.Loader;
7. import android.app.FragmentTransaction; ->
   import androidx.fragment.app.FragmentTransaction;
8. import android.app.FragmentManager; ->
   import androidx.fragment.app.FragmentManager;
9. import android.app.LoaderManager.LoaderCallbacks; ->
    import androidx.loader.app.LoaderManager.LoaderCallbacks;

Bug: 110259478
Test: Can't test it.
Change-Id: I0a3f98fff34a3494a839c3c42aeabcec3df2c8b3
This commit is contained in:
tmfang
2018-06-26 19:01:57 +08:00
committed by Fan Zhang
parent 412222ea80
commit 99cc23d0da
309 changed files with 498 additions and 555 deletions

View File

@@ -18,7 +18,6 @@ package com.android.settings.password;
import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PARENT_PROFILE_PASSWORD;
import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD;
import static com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment
.RESULT_FINISHED;
@@ -26,8 +25,6 @@ import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.Fragment;
import android.app.FragmentManager;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.Intent;
@@ -66,6 +63,8 @@ import java.util.List;
import androidx.annotation.StringRes;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;

View File

@@ -23,7 +23,6 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX;
import android.app.Activity;
import android.app.Fragment;
import android.app.admin.DevicePolicyManager;
import android.app.admin.PasswordMetrics;
import android.content.Context;
@@ -70,6 +69,7 @@ import java.util.ArrayList;
import java.util.List;
import androidx.annotation.StringRes;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

View File

@@ -17,7 +17,6 @@
package com.android.settings.password;
import android.app.Activity;
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.content.res.ColorStateList;
@@ -55,6 +54,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import androidx.fragment.app.Fragment;
/**
* If the user has a lock pattern set already, makes them confirm the existing one.
*

View File

@@ -18,7 +18,6 @@ package com.android.settings.password;
import android.annotation.Nullable;
import android.app.Activity;
import android.app.Fragment;
import android.app.KeyguardManager;
import android.app.admin.DevicePolicyManager;
import android.content.Intent;
@@ -32,6 +31,8 @@ import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.setupwizardlib.util.WizardManagerHelper;
import androidx.fragment.app.Fragment;
public final class ChooseLockSettingsHelper {
public static final String EXTRA_KEY_TYPE = "type";

View File

@@ -20,7 +20,6 @@ import android.app.Activity;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.app.Dialog;
import android.app.Fragment;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.DialogInterface;
@@ -43,6 +42,8 @@ import com.android.setupwizardlib.util.WizardManagerHelper;
import java.util.List;
import androidx.fragment.app.Fragment;
/**
* A dialog fragment similar to {@link ChooseLockGeneric} where the user can select from a few
* lock screen types.

View File

@@ -16,7 +16,6 @@
package com.android.settings.password;
import android.app.Fragment;
import android.app.KeyguardManager;
import android.os.Bundle;
import android.os.UserManager;
@@ -29,6 +28,8 @@ import com.android.settings.SettingsActivity;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
import androidx.fragment.app.Fragment;
public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivity {
private static final String STATE_IS_KEYGUARD_LOCKED = "STATE_IS_KEYGUARD_LOCKED";

View File

@@ -22,8 +22,6 @@ import android.app.ActivityManager;
import android.app.ActivityOptions;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.app.FragmentManager;
import android.app.IActivityManager;
import android.app.KeyguardManager;
import android.app.admin.DevicePolicyManager;
@@ -52,8 +50,11 @@ import android.widget.TextView;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.biometrics.fingerprint.FingerprintUiHelper;
import com.android.settings.core.InstrumentedFragment;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentManager;
/**
* Base fragment to be shared for PIN/Pattern/Password confirmation fragments.

View File

@@ -16,7 +16,6 @@
package com.android.settings.password;
import android.app.Fragment;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.Intent;
@@ -51,6 +50,8 @@ import com.android.settingslib.animation.DisappearAnimationUtils;
import java.util.ArrayList;
import androidx.fragment.app.Fragment;
public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
// The index of the array is isStrongAuth << 2 + isProfile << 1 + isAlpha.

View File

@@ -16,10 +16,11 @@
package com.android.settings.password;
import android.app.Fragment;
import android.content.Intent;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
/**
* An invisible retained fragment to track lock check result.
*/

View File

@@ -16,7 +16,6 @@
package com.android.settings.password;
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.os.AsyncTask;
@@ -25,6 +24,8 @@ import android.os.UserManager;
import com.android.internal.widget.LockPatternUtils;
import androidx.fragment.app.Fragment;
/**
* An invisible retained worker fragment to track the AsyncWork that saves (and optionally
* verifies if a challenge is given) the chosen lock credential (pattern/pin/password).

View File

@@ -36,7 +36,6 @@ import com.android.settings.utils.SettingsDividerItemDecoration;
import com.android.setupwizardlib.GlifPreferenceLayout;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragment;
import androidx.recyclerview.widget.RecyclerView;
/**

View File

@@ -17,7 +17,6 @@
package com.android.settings.password;
import android.app.Activity;
import android.app.Fragment;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.Intent;
@@ -32,6 +31,7 @@ import com.android.settings.SetupRedactionInterstitial;
import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
/**
* Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure

View File

@@ -16,7 +16,6 @@
package com.android.settings.password;
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@@ -29,6 +28,7 @@ import com.android.settings.R;
import com.android.settings.SetupRedactionInterstitial;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
/**
* Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure

View File

@@ -19,7 +19,6 @@ package com.android.settings.password;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.FragmentManager;
import android.content.DialogInterface;
import android.os.Bundle;
@@ -28,6 +27,7 @@ import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentManager;
public class SetupSkipDialog extends InstrumentedDialogFragment
implements DialogInterface.OnClickListener {