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

Commit 99cc23d0 authored by tmfang's avatar tmfang Committed by Fan Zhang
Browse files

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
parent 412222ea

src/com/android/settings/CustomListPreference.java

+2 −3
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.settings; 


import android.app.AlertDialog;

import android.app.Dialog;

import android.app.Fragment;

import android.app.FragmentTransaction;

import android.content.Context;

import android.content.DialogInterface;

import android.content.DialogInterface.OnClickListener;
@@ -30,8 +28,9 @@ import android.util.AttributeSet; 
import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;



import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentTransaction;

import androidx.preference.ListPreference;

import androidx.preference.ListPreferenceDialogFragment;



public class CustomListPreference extends ListPreference {

src/com/android/settings/RestrictedListPreference.java

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import com.android.settingslib.RestrictedPreferenceHelper; 
import java.util.ArrayList;

import java.util.List;



import androidx.preference.ListPreferenceDialogFragment;

import androidx.preference.PreferenceViewHolder;



public class RestrictedListPreference extends CustomListPreference {

src/com/android/settings/SettingsActivity.java

+9 −9
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO; 


import android.app.ActionBar;

import android.app.ActivityManager;

import android.app.Fragment;

import android.app.FragmentManager;

import android.app.FragmentTransaction;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;
@@ -45,12 +42,6 @@ import android.view.ViewGroup; 
import android.widget.Button;

import android.widget.Toolbar;



import androidx.annotation.VisibleForTesting;

import androidx.localbroadcastmanager.content.LocalBroadcastManager;

import androidx.preference.Preference;

import androidx.preference.PreferenceFragment;

import androidx.preference.PreferenceManager;



import com.android.internal.util.ArrayUtils;

import com.android.settings.Settings.WifiSettingsActivity;

import com.android.settings.applications.manageapplications.ManageApplications;
@@ -73,6 +64,15 @@ import com.android.settingslib.utils.ThreadUtils; 
import java.util.ArrayList;

import java.util.List;



import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;

import androidx.fragment.app.FragmentTransaction;

import androidx.localbroadcastmanager.content.LocalBroadcastManager;

import androidx.preference.Preference;

import androidx.preference.PreferenceFragment;

import androidx.preference.PreferenceManager;





public class SettingsActivity extends SettingsBaseActivity

        implements PreferenceManager.OnPreferenceTreeClickListener,

src/com/android/settings/SettingsLicenseActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -17,11 +17,9 @@ 
package com.android.settings;



import android.app.Activity;

import android.app.LoaderManager;

import android.content.ActivityNotFoundException;

import android.content.ContentResolver;

import android.content.Intent;

import android.content.Loader;

import android.net.Uri;

import android.os.Bundle;

import android.os.SystemProperties;
@@ -36,6 +34,8 @@ import java.io.File; 


import androidx.annotation.VisibleForTesting;

import androidx.core.content.FileProvider;

import androidx.loader.app.LoaderManager;

import androidx.loader.content.Loader;



/**

 * The "dialog" that shows from "License" in the Settings app.

src/com/android/settings/SettingsPreferenceFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.settings; 


import android.app.Activity;

import android.app.Dialog;

import android.app.DialogFragment;

import android.app.Fragment;

import android.content.ContentResolver;

import android.content.Context;

import android.content.DialogInterface;
@@ -52,6 +50,8 @@ import java.util.UUID; 


import androidx.annotation.VisibleForTesting;

import androidx.annotation.XmlRes;

import androidx.fragment.app.DialogFragment;

import androidx.fragment.app.Fragment;

import androidx.preference.Preference;

import androidx.preference.PreferenceGroup;

import androidx.preference.PreferenceScreen;