PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings Fragment Migration (Build pass app)

Browse Source 
This patch focused on fixing compile errors and some runtime errors.

Test: We can't test it now. But we will have an integration test later.
Bug: 110259478
Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b
This commit is contained in:
tmfang
2018-06-28 11:39:05 +08:00
committed by Fan Zhang
parent 99cc23d0da
commit 27c84de325
164 changed files with 792 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proguard.flags
View File

@@ -6,7 +6,7 @@
-keepattributes Exceptions
# Keep all Fragments in this package, which are used by reflection.
-keep public class com.android.settings.** extends android.app.Fragment
-keep public class com.android.settings.** extends androidx.fragment.app.Fragment
# Keep all preference controllers needed by slice and DashboardFragment.
-keep class * extends com.android.settings.core.BasePreferenceController {

4
res/values/themes.xml
View File

@@ -239,8 +239,8 @@
<item name="preferenceBackgroundColor">@drawable/preference_background</item>
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/Theme.AlertDialog</item>
<!-- For all androidx version of AlertDialogs -->
<item name="alertDialogTheme">@style/Theme.AppCompat.Light.Dialog.Alert</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>

7
src/com/android/settings/BugreportPreference.java
View File

@@ -17,7 +17,6 @@
package com.android.settings;
import android.app.ActivityManager;
import android.app.AlertDialog.Builder;
import android.content.Context;
import android.content.DialogInterface;
import android.os.RemoteException;
@@ -29,9 +28,11 @@ import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.CustomDialogPreference;
import com.android.settingslib.CustomDialogPreferenceCompat;
public class BugreportPreference extends CustomDialogPreference {
import androidx.appcompat.app.AlertDialog.Builder;
public class BugreportPreference extends CustomDialogPreferenceCompat {
private static final String TAG = "BugreportPreference";

7
src/com/android/settings/CredentialStorage.java
View File

@@ -49,6 +49,7 @@ import com.android.settings.vpn2.VpnUtils;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import androidx.fragment.app.FragmentActivity;
import sun.security.util.ObjectIdentifier;
import sun.security.x509.AlgorithmId;
@@ -88,7 +89,7 @@ import sun.security.x509.AlgorithmId;
* Action: normal unlock/install
* Notes: this is the common case
*/
public final class CredentialStorage extends Activity {
public final class CredentialStorage extends FragmentActivity {
private static final String TAG = "CredentialStorage";
@@ -160,7 +161,7 @@ public final class CredentialStorage extends Activity {
case UNLOCKED: {
if (isActivePasswordQualityInsufficient()) {
final ConfigureKeyGuardDialog dialog = new ConfigureKeyGuardDialog();
dialog.show(getFragmentManager(), ConfigureKeyGuardDialog.TAG);
dialog.show(getSupportFragmentManager(), ConfigureKeyGuardDialog.TAG);
return;
}
installIfAvailable();
@@ -180,7 +181,7 @@ public final class CredentialStorage extends Activity {
if (isActivePasswordQualityInsufficient()) {
// key guard not setup, doing so will initialize keystore
final ConfigureKeyGuardDialog dialog = new ConfigureKeyGuardDialog();
dialog.show(getFragmentManager(), ConfigureKeyGuardDialog.TAG);
dialog.show(getSupportFragmentManager(), ConfigureKeyGuardDialog.TAG);
// will return to onResume after Activity
return;
}

14
src/com/android/settings/CustomListPreference.java
View File

@@ -28,9 +28,11 @@ import android.util.AttributeSet;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import androidx.appcompat.app.AlertDialog.Builder;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
import androidx.preference.ListPreference;
import androidx.preference.ListPreferenceDialogFragmentCompat;
public class CustomListPreference extends ListPreference {
@@ -43,7 +45,7 @@ public class CustomListPreference extends ListPreference {
super(context, attrs, defStyleAttr, defStyleRes);
}
protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
protected void onPrepareDialogBuilder(Builder builder,
DialogInterface.OnClickListener listener) {
}
@@ -72,15 +74,17 @@ public class CustomListPreference extends ListPreference {
protected void onDialogStateRestored(Dialog dialog, Bundle savedInstanceState) {
}
public static class CustomListPreferenceDialogFragment extends ListPreferenceDialogFragment {
public static class CustomListPreferenceDialogFragment extends
ListPreferenceDialogFragmentCompat {
private static final java.lang.String KEY_CLICKED_ENTRY_INDEX
= "settings.CustomListPrefDialog.KEY_CLICKED_ENTRY_INDEX";
private int mClickedDialogEntryIndex;
public static ListPreferenceDialogFragment newInstance(String key) {
final ListPreferenceDialogFragment fragment = new CustomListPreferenceDialogFragment();
public static ListPreferenceDialogFragmentCompat newInstance(String key) {
final ListPreferenceDialogFragmentCompat fragment =
new CustomListPreferenceDialogFragment();
final Bundle b = new Bundle(1);
b.putString(ARG_KEY, key);
fragment.setArguments(b);
@@ -92,7 +96,7 @@ public class CustomListPreference extends ListPreference {
}
@Override
protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
protected void onPrepareDialogBuilder(Builder builder) {
super.onPrepareDialogBuilder(builder);
mClickedDialogEntryIndex = getCustomizablePreference()
.findIndexOfValue(getCustomizablePreference().getValue());

2
src/com/android/settings/DateTimeSettings.java
View File

@@ -71,7 +71,7 @@ public class DateTimeSettings extends DashboardFragment implements
@Override
public void onAttach(Context context) {
super.onAttach(context);
getLifecycle().addObserver(new TimeChangeListenerMixin(context, this));
getSettingsLifecycle().addObserver(new TimeChangeListenerMixin(context, this));
}
@Override

2
src/com/android/settings/DisplaySettings.java
View File

@@ -69,7 +69,7 @@ public class DisplaySettings extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle());
return buildPreferenceControllers(context, getSettingsLifecycle());
}
@Override

10
src/com/android/settings/EditPinPreference.java
View File

@@ -23,19 +23,19 @@ import android.util.AttributeSet;
import android.view.View;
import android.widget.EditText;
import com.android.settingslib.CustomEditTextPreference;
import com.android.settingslib.CustomEditTextPreferenceCompat;
/**
* TODO: Add a soft dialpad for PIN entry.
*/
class EditPinPreference extends CustomEditTextPreference {
class EditPinPreference extends CustomEditTextPreferenceCompat {
interface OnPinEnteredListener {
void onPinEntered(EditPinPreference preference, boolean positiveResult);
}
private OnPinEnteredListener mPinListener;
public EditPinPreference(Context context, AttributeSet attrs) {
super(context, attrs);
}
@@ -43,7 +43,7 @@ class EditPinPreference extends CustomEditTextPreference {
public EditPinPreference(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}
public void setOnPinEnteredListener(OnPinEnteredListener listener) {
mPinListener = listener;
}

2
src/com/android/settings/ProxySelector.java
View File

@@ -113,7 +113,7 @@ public class ProxySelector extends InstrumentedFragment implements DialogCreatab
Log.e(TAG, "Old dialog fragment not null!");
}
mDialogFragment = new SettingsDialogFragment(this, dialogId);
mDialogFragment.show(getActivity().getFragmentManager(), Integer.toString(dialogId));
mDialogFragment.show(getActivity().getSupportFragmentManager(), Integer.toString(dialogId));
}
private void initView(View view) {

8
src/com/android/settings/RestrictedListPreference.java
View File

@@ -41,6 +41,8 @@ import com.android.settingslib.RestrictedPreferenceHelper;
import java.util.ArrayList;
import java.util.List;
import androidx.appcompat.app.AlertDialog.Builder;
import androidx.preference.ListPreferenceDialogFragmentCompat;
import androidx.preference.PreferenceViewHolder;
public class RestrictedListPreference extends CustomListPreference {
@@ -168,7 +170,7 @@ public class RestrictedListPreference extends CustomListPreference {
}
@Override
protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
protected void onPrepareDialogBuilder(Builder builder,
DialogInterface.OnClickListener listener) {
builder.setAdapter(createListAdapter(), listener);
}
@@ -218,8 +220,8 @@ public class RestrictedListPreference extends CustomListPreference {
CustomListPreference.CustomListPreferenceDialogFragment {
private int mLastCheckedPosition = AdapterView.INVALID_POSITION;
public static ListPreferenceDialogFragment newInstance(String key) {
final ListPreferenceDialogFragment fragment
public static ListPreferenceDialogFragmentCompat newInstance(String key) {
final ListPreferenceDialogFragmentCompat fragment
= new RestrictedListPreferenceDialogFragment();
final Bundle b = new Bundle(1);
b.putString(ARG_KEY, key);

4
src/com/android/settings/SeekBarDialogPreference.java
View File

@@ -23,13 +23,13 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.SeekBar;
import com.android.settingslib.CustomDialogPreference;
import com.android.settingslib.CustomDialogPreferenceCompat;
/**
* Based on frameworks/base/core/java/android/preference/SeekBarDialogPreference.java
* except uses support lib preferences.
*/
public class SeekBarDialogPreference extends CustomDialogPreference {
public class SeekBarDialogPreference extends CustomDialogPreferenceCompat {
private final Drawable mMyIcon;
public SeekBarDialogPreference(Context context, AttributeSet attrs) {

17
src/com/android/settings/SettingsActivity.java
View File

@@ -70,13 +70,13 @@ 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.PreferenceFragmentCompat;
import androidx.preference.PreferenceManager;
public class SettingsActivity extends SettingsBaseActivity
implements PreferenceManager.OnPreferenceTreeClickListener,
PreferenceFragment.OnPreferenceStartFragmentCallback,
PreferenceFragmentCompat.OnPreferenceStartFragmentCallback,
ButtonBarHandler, FragmentManager.OnBackStackChangedListener {
private static final String LOG_TAG = "SettingsActivity";
@@ -190,7 +190,7 @@ public class SettingsActivity extends SettingsBaseActivity
}
@Override
public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {
public boolean onPreferenceStartFragment(PreferenceFragmentCompat caller, Preference pref) {
new SubSettingLauncher(this)
.setDestination(pref.getFragment())
.setArguments(pref.getExtras())
@@ -270,7 +270,7 @@ public class SettingsActivity extends SettingsBaseActivity
mContent = findViewById(R.id.main_content);
getFragmentManager().addOnBackStackChangedListener(this);
getSupportFragmentManager().addOnBackStackChangedListener(this);
if (savedState != null) {
// We are restarting from a previous saved state; used that to initialize, instead
@@ -430,7 +430,7 @@ public class SettingsActivity extends SettingsBaseActivity
}
private void setTitleFromBackStack() {
final int count = getFragmentManager().getBackStackEntryCount();
final int count = getSupportFragmentManager().getBackStackEntryCount();
if (count == 0) {
if (mInitialTitleResId > 0) {
@@ -441,7 +441,8 @@ public class SettingsActivity extends SettingsBaseActivity
return;
}
FragmentManager.BackStackEntry bse = getFragmentManager().getBackStackEntryAt(count - 1);
FragmentManager.BackStackEntry bse = getSupportFragmentManager().
getBackStackEntryAt(count - 1);
setTitleFromBackStackEntry(bse);
}
@@ -581,7 +582,7 @@ public class SettingsActivity extends SettingsBaseActivity
+ fragmentName);
}
Fragment f = Fragment.instantiate(this, fragmentName, args);
FragmentTransaction transaction = getFragmentManager().beginTransaction();
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
transaction.replace(R.id.main_content, f);
if (withTransition) {
TransitionManager.beginDelayedTransition(mContent);
@@ -595,7 +596,7 @@ public class SettingsActivity extends SettingsBaseActivity
transaction.setBreadCrumbTitle(title);
}
transaction.commitAllowingStateLoss();
getFragmentManager().executePendingTransactions();
getSupportFragmentManager().executePendingTransactions();
Log.d(LOG_TAG, "Executed frag manager pendingTransactions");
return f;
}

11
src/com/android/settings/SettingsHomepageActivity.java
View File

@@ -16,9 +16,6 @@
package com.android.settings;
import android.app.Activity;
import android.app.Fragment;
import android.app.FragmentManager;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@@ -28,6 +25,10 @@ import com.android.settings.core.FeatureFlags;
import com.android.settings.core.SettingsBaseActivity;
import com.android.settings.homepage.HomepageFragment;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
public class SettingsHomepageActivity extends SettingsBaseActivity {
@Override
@@ -51,10 +52,10 @@ public class SettingsHomepageActivity extends SettingsBaseActivity {
/**
* Switch to a specific Fragment
*/
public static void switchToFragment(Activity activity, int id, String fragmentName) {
public static void switchToFragment(FragmentActivity activity, int id, String fragmentName) {
final Fragment f = Fragment.instantiate(activity, fragmentName, null /* args */);
FragmentManager manager = activity.getFragmentManager();
FragmentManager manager = activity.getSupportFragmentManager();
manager.beginTransaction().replace(id, f).commitAllowingStateLoss();
manager.executePendingTransactions();
}

10
src/com/android/settings/SettingsLicenseActivity.java
View File

@@ -16,7 +16,6 @@
package com.android.settings;
import android.app.Activity;
import android.content.ActivityNotFoundException;
import android.content.ContentResolver;
import android.content.Intent;
@@ -28,19 +27,20 @@ import android.util.Log;
import android.widget.Toast;
import com.android.settings.users.RestrictedProfileSettings;
import com.android.settingslib.license.LicenseHtmlLoader;
import com.android.settingslib.license.LicenseHtmlLoaderCompat;
import java.io.File;
import androidx.annotation.VisibleForTesting;
import androidx.core.content.FileProvider;
import androidx.fragment.app.FragmentActivity;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
/**
* The "dialog" that shows from "License" in the Settings app.
*/
public class SettingsLicenseActivity extends Activity implements
public class SettingsLicenseActivity extends FragmentActivity implements
LoaderManager.LoaderCallbacks<File> {
private static final String TAG = "SettingsLicenseActivity";
@@ -64,7 +64,7 @@ public class SettingsLicenseActivity extends Activity implements
@Override
public Loader<File> onCreateLoader(int id, Bundle args) {
return new LicenseHtmlLoader(this);
return new LicenseHtmlLoaderCompat(this);
}
@Override
@@ -77,7 +77,7 @@ public class SettingsLicenseActivity extends Activity implements
}
private void showHtmlFromDefaultXmlFiles() {
getLoaderManager().initLoader(LOADER_ID_LICENSE_HTML_LOADER, Bundle.EMPTY, this);
getSupportLoaderManager().initLoader(LOADER_ID_LICENSE_HTML_LOADER, Bundle.EMPTY, this);
}
@VisibleForTesting

18
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -41,10 +41,10 @@ import com.android.settings.support.actionbar.HelpMenuController;
import com.android.settings.support.actionbar.HelpResourceProvider;
import com.android.settings.widget.HighlightablePreferenceGroupAdapter;
import com.android.settings.widget.LoadingViewController;
import com.android.settingslib.CustomDialogPreference;
import com.android.settingslib.CustomEditTextPreference;
import com.android.settingslib.CustomDialogPreferenceCompat;
import com.android.settingslib.CustomEditTextPreferenceCompat;
import com.android.settingslib.core.instrumentation.Instrumentable;
import com.android.settingslib.widget.FooterPreferenceMixin;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import java.util.UUID;
@@ -68,8 +68,8 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
private static final String SAVE_HIGHLIGHTED_KEY = "android:preference_highlighted";
protected final FooterPreferenceMixin mFooterPreferenceMixin =
new FooterPreferenceMixin(this, getLifecycle());
protected final FooterPreferenceMixinCompat mFooterPreferenceMixin =
new FooterPreferenceMixinCompat(this, getSettingsLifecycle());
private static final int ORDER_FIRST = -1;
@@ -517,11 +517,11 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
} else if (preference instanceof CustomListPreference) {
f = CustomListPreference.CustomListPreferenceDialogFragment
.newInstance(preference.getKey());
} else if (preference instanceof CustomDialogPreference) {
f = CustomDialogPreference.CustomPreferenceDialogFragment
} else if (preference instanceof CustomDialogPreferenceCompat) {
f = CustomDialogPreferenceCompat.CustomPreferenceDialogFragment
.newInstance(preference.getKey());
} else if (preference instanceof CustomEditTextPreference) {
f = CustomEditTextPreference.CustomPreferenceDialogFragment
} else if (preference instanceof CustomEditTextPreferenceCompat) {
f = CustomEditTextPreferenceCompat.CustomPreferenceDialogFragment
.newInstance(preference.getKey());
} else {
super.onDisplayPreferenceDialog(preference);

2
src/com/android/settings/TetherSettings.java
View File

@@ -112,7 +112,7 @@ public class TetherSettings extends RestrictedSettingsFragment
public void onAttach(Context context) {
super.onAttach(context);
mWifiTetherPreferenceController =
new WifiTetherPreferenceController(context, getLifecycle());
new WifiTetherPreferenceController(context, getSettingsLifecycle());
}
@Override

3
src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
View File

@@ -27,6 +27,7 @@ import com.android.settings.support.actionbar.HelpResourceProvider;
import com.android.settingslib.core.instrumentation.Instrumentable;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivity {
@@ -70,7 +71,7 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit
}
@Override
public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {
public boolean onPreferenceStartFragment(PreferenceFragmentCompat caller, Preference pref) {
Bundle args = pref.getExtras();
if (args == null) {
args = new Bundle();

9
src/com/android/settings/accessibility/ListDialogPreference.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.accessibility;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
@@ -31,12 +30,14 @@ import android.widget.AbsListView;
import android.widget.AdapterView;
import android.widget.BaseAdapter;
import com.android.settingslib.CustomDialogPreference;
import com.android.settingslib.CustomDialogPreferenceCompat;
import androidx.appcompat.app.AlertDialog.Builder;
/**
* Abstract dialog preference that displays a set of values and optional titles.
*/
public abstract class ListDialogPreference extends CustomDialogPreference {
public abstract class ListDialogPreference extends CustomDialogPreferenceCompat {
private CharSequence[] mEntryTitles;
private int[] mEntryValues;
@@ -138,7 +139,7 @@ public abstract class ListDialogPreference extends CustomDialogPreference {
}
@Override
protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
protected void onPrepareDialogBuilder(Builder builder,
DialogInterface.OnClickListener listener) {
super.onPrepareDialogBuilder(builder, listener);

7
src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
View File

@@ -22,7 +22,6 @@ import static com.android.internal.accessibility.AccessibilityShortcutController
.DALTONIZER_COMPONENT_NAME;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.Activity;
import android.app.Dialog;
import android.content.ComponentName;
import android.content.Context;
@@ -55,6 +54,7 @@ import java.util.List;
import java.util.Map;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
/**
* Fragment for picking accessibility shortcut service
@@ -135,10 +135,11 @@ public class ShortcutServicePickerFragment extends RadioButtonPickerFragment {
// This is a framework feature. It doesn't need to be confirmed.
onRadioButtonConfirmed(selectedKey);
} else {
final Activity activity = getActivity();
final FragmentActivity activity = getActivity();
if (activity != null) {
ConfirmationDialogFragment.newInstance(this, selectedKey)
.show(activity.getFragmentManager(), ConfirmationDialogFragment.TAG);
.show(activity.getSupportFragmentManager(),
ConfirmationDialogFragment.TAG);
}
}
}

2
src/com/android/settings/accounts/AccountDashboardFragment.java
View File

@@ -80,7 +80,7 @@ public class AccountDashboardFragment extends DashboardFragment {
final AccountPreferenceController accountPrefController =
new AccountPreferenceController(context, parent, authorities);
if (parent != null) {
parent.getLifecycle().addObserver(accountPrefController);
parent.getSettingsLifecycle().addObserver(accountPrefController);
}
controllers.add(accountPrefController);
controllers.add(new AutoSyncDataPreferenceController(context, parent));

2
src/com/android/settings/accounts/AccountDetailDashboardFragment.java
View File

@@ -117,7 +117,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
mRemoveAccountController = new RemoveAccountPreferenceController(context, this);
controllers.add(mRemoveAccountController);
controllers.add(new AccountHeaderPreferenceController(
context, getLifecycle(), getActivity(), this /* host */, getArguments()));
context, getSettingsLifecycle(), getActivity(), this /* host */, getArguments()));
return controllers;
}

5
src/com/android/settings/accounts/AccountHeaderPreferenceController.java
View File

@@ -35,6 +35,7 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnResume;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
public class AccountHeaderPreferenceController extends AbstractPreferenceController
@@ -43,14 +44,14 @@ public class AccountHeaderPreferenceController extends AbstractPreferenceControl
private static final String KEY_ACCOUNT_HEADER = "account_header";
private final Activity mActivity;
private final PreferenceFragment mHost;
private final PreferenceFragmentCompat mHost;
private final Account mAccount;
private final UserHandle mUserHandle;
private LayoutPreference mHeaderPreference;
public AccountHeaderPreferenceController(Context context, Lifecycle lifecycle,
Activity activity, PreferenceFragment host, Bundle args) {
Activity activity, PreferenceFragmentCompat host, Bundle args) {
super(context);
mActivity = activity;
mHost = host;

2
src/com/android/settings/accounts/AccountSyncSettings.java
View File

@@ -122,7 +122,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
final Activity activity = getActivity();
final Preference pref = EntityHeaderController
.newInstance(activity, this, null /* header */)
.setRecyclerView(getListView(), getLifecycle())
.setRecyclerView(getListView(), getSettingsLifecycle())
.setIcon(getDrawableForType(mAccount.type))
.setLabel(mAccount.name)
.setSummary(getLabelForType(mAccount.type))

5
src/com/android/settings/accounts/AccountTypePreferenceLoader.java
View File

@@ -41,6 +41,7 @@ import com.android.settingslib.core.instrumentation.Instrumentable;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
@@ -60,9 +61,9 @@ public class AccountTypePreferenceLoader {
private AuthenticatorHelper mAuthenticatorHelper;
private UserHandle mUserHandle;
private PreferenceFragment mFragment;
private PreferenceFragmentCompat mFragment;
public AccountTypePreferenceLoader(PreferenceFragment fragment,
public AccountTypePreferenceLoader(PreferenceFragmentCompat fragment,
AuthenticatorHelper authenticatorHelper, UserHandle userHandle) {
mFragment = fragment;
mAuthenticatorHelper = authenticatorHelper;

6
src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
View File

@@ -22,7 +22,7 @@ import com.android.settings.core.BasePreferenceController;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.FooterPreferenceMixin;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
@@ -30,7 +30,7 @@ import androidx.preference.PreferenceScreen;
public class EnterpriseDisclosurePreferenceController extends BasePreferenceController {
private final EnterprisePrivacyFeatureProvider mFeatureProvider;
private FooterPreferenceMixin mFooterPreferenceMixin;
private FooterPreferenceMixinCompat mFooterPreferenceMixin;
private PreferenceScreen mScreen;
public EnterpriseDisclosurePreferenceController(Context context) {
@@ -41,7 +41,7 @@ public class EnterpriseDisclosurePreferenceController extends BasePreferenceCont
.getEnterprisePrivacyFeatureProvider(mContext);
}
public void setFooterPreferenceMixin(FooterPreferenceMixin footerPreferenceMixin) {
public void setFooterPreferenceMixin(FooterPreferenceMixinCompat footerPreferenceMixin) {
mFooterPreferenceMixin = footerPreferenceMixin;
}

2
src/com/android/settings/applications/AppInfoBase.java
View File

@@ -93,7 +93,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
mApplicationFeatureProvider = FeatureFactory.getFactory(activity)
.getApplicationFeatureProvider(activity);
mState = ApplicationsState.getInstance(activity.getApplication());
mSession = mState.newSession(this, getLifecycle());
mSession = mState.newSession(this, getSettingsLifecycle());
mDpm = (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
mUserManager = (UserManager) activity.getSystemService(Context.USER_SERVICE);
mPm = activity.getPackageManager();

2
src/com/android/settings/applications/AppInfoWithHeader.java
View File

@@ -44,7 +44,7 @@ public abstract class AppInfoWithHeader extends AppInfoBase {
final Activity activity = getActivity();
final Preference pref = EntityHeaderController
.newInstance(activity, this, null /* header */)
.setRecyclerView(getListView(), getLifecycle())
.setRecyclerView(getListView(), getSettingsLifecycle())
.setIcon(IconDrawableFactory.newInstance(getContext())
.getBadgedIcon(mPackageInfo.applicationInfo))
.setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))

2
src/com/android/settings/applications/DirectoryAccessDetails.java
View File

@@ -99,7 +99,7 @@ public class DirectoryAccessDetails extends AppInfoBase {
final Activity activity = getActivity();
final Preference pref = EntityHeaderController
.newInstance(activity, this, /* header= */ null )
.setRecyclerView(getListView(), getLifecycle())
.setRecyclerView(getListView(), getSettingsLifecycle())
.setIcon(IconDrawableFactory.newInstance(getPrefContext())
.getBadgedIcon(mPackageInfo.applicationInfo))
.setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))

4
src/com/android/settings/applications/FetchPackageStorageAsyncLoader.java
View File

@@ -26,14 +26,14 @@ import android.util.Log;
import com.android.internal.util.Preconditions;
import com.android.settingslib.applications.StorageStatsSource;
import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
import com.android.settingslib.utils.AsyncLoader;
import com.android.settingslib.utils.AsyncLoaderCompat;
import java.io.IOException;
/**
* Fetches the storage stats using the StorageStatsManager for a given package and user tuple.
*/
public class FetchPackageStorageAsyncLoader extends AsyncLoader<AppStorageStats> {
public class FetchPackageStorageAsyncLoader extends AsyncLoaderCompat<AppStorageStats> {
private static final String TAG = "FetchPackageStorage";
private final StorageStatsSource mSource;
private final ApplicationInfo mInfo;

2
src/com/android/settings/applications/ProcessStatsDetail.java
View File

@@ -129,7 +129,7 @@ public class ProcessStatsDetail extends SettingsPreferenceFragment {
final Activity activity = getActivity();
final Preference pref = EntityHeaderController
.newInstance(activity, this, null /* appHeader */)
.setRecyclerView(getListView(), getLifecycle())
.setRecyclerView(getListView(), getSettingsLifecycle())
.setIcon(mApp.mUiTargetApp != null
? IconDrawableFactory.newInstance(activity).getBadgedIcon(mApp.mUiTargetApp)
: new ColorDrawable(0))

2
src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
View File

@@ -568,7 +568,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
private void showDialogInner(@ButtonActionDialogFragment.DialogType int id) {
ButtonActionDialogFragment newFragment = ButtonActionDialogFragment.newInstance(id);
newFragment.setTargetFragment(mFragment, 0);
newFragment.show(mActivity.getFragmentManager(), "dialog " + id);
newFragment.show(mActivity.getSupportFragmentManager(), "dialog " + id);
}
/** Returns whether there is only one user on this device, not including the system-only user */

6
src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
View File

@@ -37,7 +37,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.net.ChartData;
import com.android.settingslib.net.ChartDataLoader;
import com.android.settingslib.net.ChartDataLoaderCompat;
import androidx.annotation.VisibleForTesting;
import androidx.loader.app.LoaderManager;
@@ -86,7 +86,7 @@ public class AppDataUsagePreferenceController extends AppInfoPreferenceControlle
final AppItem app = new AppItem(uid);
app.addUid(uid);
mParent.getLoaderManager().restartLoader(mParent.LOADER_CHART_DATA,
ChartDataLoader.buildArgs(getTemplate(mContext), app),
ChartDataLoaderCompat.buildArgs(getTemplate(mContext), app),
this);
}
}
@@ -98,7 +98,7 @@ public class AppDataUsagePreferenceController extends AppInfoPreferenceControlle
@Override
public Loader<ChartData> onCreateLoader(int id, Bundle args) {
return new ChartDataLoader(mContext, mStatsSession, args);
return new ChartDataLoaderCompat(mContext, mStatsSession, args);
}
@Override

4
src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
View File

@@ -238,7 +238,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
}
final String packageName = getPackageName();
final List<AbstractPreferenceController> controllers = new ArrayList<>();
final Lifecycle lifecycle = getLifecycle();
final Lifecycle lifecycle = getSettingsLifecycle();
// The following are controllers for preferences that needs to refresh the preference state
// when app state changes.
@@ -524,7 +524,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
}
if (mState == null) {
mState = ApplicationsState.getInstance(activity.getApplication());
mSession = mState.newSession(this, getLifecycle());
mSession = mState.newSession(this, getSettingsLifecycle());
}
mUserId = UserHandle.myUserId();
mAppEntry = mState.getEntry(getPackageName(), UserHandle.myUserId());

2
src/com/android/settings/applications/assist/ManageAssist.java
View File

@@ -54,7 +54,7 @@ public class ManageAssist extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle());
return buildPreferenceControllers(context, getSettingsLifecycle());
}
@Override

6
src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.applications.defaultapps;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
@@ -36,6 +35,7 @@ import com.android.settingslib.widget.CandidateInfo;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
/**
* A generic app picker fragment that shows a list of app as radio button group.
@@ -54,13 +54,13 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
public void onRadioButtonClicked(RadioButtonPreference selected) {
final String selectedKey = selected.getKey();
final CharSequence confirmationMessage = getConfirmationMessage(getCandidate(selectedKey));
final Activity activity = getActivity();
final FragmentActivity activity = getActivity();
if (TextUtils.isEmpty(confirmationMessage)) {
super.onRadioButtonClicked(selected);
} else if (activity != null) {
final DialogFragment fragment =
newConfirmationDialogFragment(selectedKey, confirmationMessage);
fragment.show(activity.getFragmentManager(), ConfirmationDialogFragment.TAG);
fragment.show(activity.getSupportFragmentManager(), ConfirmationDialogFragment.TAG);
}
}

2
src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java
View File

@@ -81,7 +81,7 @@ public class DomainAppPreferenceController extends BasePreferenceController impl
public void setFragment(ManageDomainUrls fragment) {
mFragment = fragment;
mMetricsCategory = fragment.getMetricsCategory();
mSession = mApplicationsState.newSession(this, mFragment.getLifecycle());
mSession = mApplicationsState.newSession(this, mFragment.getSettingsLifecycle());
}
@Override

6
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
View File

@@ -45,7 +45,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.FooterPreferenceMixin;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import java.util.ArrayList;
import java.util.Collection;
@@ -88,7 +88,7 @@ public class DeviceAdminListPreferenceController extends BasePreferenceControlle
};
private PreferenceGroup mPreferenceGroup;
private FooterPreferenceMixin mFooterPreferenceMixin;
private FooterPreferenceMixinCompat mFooterPreferenceMixin;
static {
FILTER.addAction(ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);
@@ -103,7 +103,7 @@ public class DeviceAdminListPreferenceController extends BasePreferenceControlle
}
public DeviceAdminListPreferenceController setFooterPreferenceMixin(
FooterPreferenceMixin mixin) {
FooterPreferenceMixinCompat mixin) {
mFooterPreferenceMixin = mixin;
return this;
}

2
src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
View File

@@ -63,7 +63,7 @@ public class PremiumSmsAccess extends EmptyTextSettings
super.onCreate(icicle);
mApplicationsState = ApplicationsState.getInstance((Application)
getContext().getApplicationContext());
mSession = mApplicationsState.newSession(this, getLifecycle());
mSession = mApplicationsState.newSession(this, getSettingsLifecycle());
mSmsBackend = new AppStateSmsPremBridge(getContext(), mApplicationsState, this);
}

6
src/com/android/settings/backup/BackupSettingsActivity.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.backup;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -34,6 +33,7 @@ import java.util.ArrayList;
import java.util.List;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
@@ -42,7 +42,7 @@ import androidx.fragment.app.FragmentManager;
* if the manufacturer provided their backup settings.
*/
@SearchIndexable
public class BackupSettingsActivity extends Activity implements Indexable {
public class BackupSettingsActivity extends FragmentActivity implements Indexable {
private static final String TAG = "BackupSettingsActivity";
private FragmentManager mFragmentManager;
@@ -81,7 +81,7 @@ public class BackupSettingsActivity extends Activity implements Indexable {
}
// mFragmentManager can be set by {@link #setFragmentManager()} for testing
if (mFragmentManager == null) {
mFragmentManager = getFragmentManager();
mFragmentManager = getSupportFragmentManager();
}
mFragmentManager.beginTransaction()
.replace(android.R.id.content, new BackupSettingsFragment())

11
src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java
View File

@@ -73,7 +73,8 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase
if (shouldFinishOnStop() && !isChangingConfigurations()) {
if (mSidecar != null) {
mSidecar.cancelEnrollment();
getFragmentManager().beginTransaction().remove(mSidecar).commitAllowingStateLoss();
getSupportFragmentManager()
.beginTransaction().remove(mSidecar).commitAllowingStateLoss();
}
finish();
}
@@ -84,7 +85,8 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase
if (mSidecar != null) {
mSidecar.setListener(null);
mSidecar.cancelEnrollment();
getFragmentManager().beginTransaction().remove(mSidecar).commitAllowingStateLoss();
getSupportFragmentManager()
.beginTransaction().remove(mSidecar).commitAllowingStateLoss();
mSidecar = null;
}
super.onBackPressed();
@@ -103,10 +105,11 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase
}
public void startEnrollment() {
mSidecar = (BiometricEnrollSidecar) getFragmentManager().findFragmentByTag(TAG_SIDECAR);
mSidecar = (BiometricEnrollSidecar) getSupportFragmentManager()
.findFragmentByTag(TAG_SIDECAR);
if (mSidecar == null) {
mSidecar = getSidecar();
getFragmentManager().beginTransaction().add(mSidecar, TAG_SIDECAR).commit();
getSupportFragmentManager().beginTransaction().add(mSidecar, TAG_SIDECAR).commit();
}
mSidecar.setListener(this);
}

4
src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
View File

@@ -31,8 +31,8 @@ import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollSidecar;
import com.android.settings.biometrics.BiometricsEnrollEnrolling;
import com.android.settings.biometrics.BiometricErrorDialog;
import com.android.settings.biometrics.BiometricsEnrollEnrolling;
import com.android.settings.password.ChooseLockSettingsHelper;
@@ -166,7 +166,7 @@ public class FaceEnrollEnrolling extends BiometricsEnrollEnrolling {
private void showErrorDialog(CharSequence msg, int msgId) {
BiometricErrorDialog dialog = FaceErrorDialog.newInstance(msg, msgId);
dialog.show(getFragmentManager(), FaceErrorDialog.class.getName());
dialog.show(getSupportFragmentManager(), FaceErrorDialog.class.getName());
}
private void showError(CharSequence error) {

4
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -303,12 +303,12 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
private void showErrorDialog(CharSequence msg, int msgId) {
BiometricErrorDialog dlg = FingerprintErrorDialog.newInstance(msg, msgId);
dlg.show(getFragmentManager(), FingerprintErrorDialog.class.getName());
dlg.show(getSupportFragmentManager(), FingerprintErrorDialog.class.getName());
}
private void showIconTouchDialog() {
mIconTouchCount = 0;
new IconTouchDialog().show(getFragmentManager(), null /* tag */);
new IconTouchDialog().show(getSupportFragmentManager(), null /* tag */);
}
private void showError(CharSequence error) {

7
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
View File

@@ -78,11 +78,11 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase {
}
private void startLookingForFingerprint() {
mSidecar = (FingerprintEnrollSidecar) getFragmentManager().findFragmentByTag(
mSidecar = (FingerprintEnrollSidecar) getSupportFragmentManager().findFragmentByTag(
FingerprintEnrollEnrolling.TAG_SIDECAR);
if (mSidecar == null) {
mSidecar = new FingerprintEnrollSidecar();
getFragmentManager().beginTransaction()
getSupportFragmentManager().beginTransaction()
.add(mSidecar, FingerprintEnrollEnrolling.TAG_SIDECAR).commit();
}
mSidecar.setListener(new Listener() {
@@ -148,7 +148,8 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase {
return;
}
}
getFragmentManager().beginTransaction().remove(mSidecar).commitAllowingStateLoss();
getSupportFragmentManager().beginTransaction().remove(mSidecar).
commitAllowingStateLoss();
mSidecar = null;
startActivityForResult(getFingerprintEnrollingIntent(), ENROLLING);
}

2
src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
View File

@@ -54,7 +54,7 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso
@Override
protected void onSkipButtonClick() {
new SkipFingerprintDialog().show(getFragmentManager());
new SkipFingerprintDialog().show(getSupportFragmentManager());
}
@Override

3
src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
View File

@@ -23,6 +23,7 @@ import com.android.settings.widget.ActionButtonPreference;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.lifecycle.Lifecycle;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
/**
@@ -36,7 +37,7 @@ public class BluetoothDetailsButtonsController extends BluetoothDetailsControlle
private boolean mConnectButtonInitialized;
private ActionButtonPreference mActionButtons;
public BluetoothDetailsButtonsController(Context context, PreferenceFragment fragment,
public BluetoothDetailsButtonsController(Context context, PreferenceFragmentCompat fragment,
CachedBluetoothDevice device, Lifecycle lifecycle) {
super(context, fragment, device, lifecycle);
mIsConnected = device.isConnected();

5
src/com/android/settings/bluetooth/BluetoothDetailsController.java
View File

@@ -26,6 +26,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
/**
@@ -37,10 +38,10 @@ public abstract class BluetoothDetailsController extends AbstractPreferenceContr
OnPause, OnResume {
protected final Context mContext;
protected final PreferenceFragment mFragment;
protected final PreferenceFragmentCompat mFragment;
protected final CachedBluetoothDevice mCachedDevice;
public BluetoothDetailsController(Context context, PreferenceFragment fragment,
public BluetoothDetailsController(Context context, PreferenceFragmentCompat fragment,
CachedBluetoothDevice device, Lifecycle lifecycle) {
super(context);
mContext = context;

3
src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
View File

@@ -30,6 +30,7 @@ import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.core.lifecycle.Lifecycle;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
/**
@@ -42,7 +43,7 @@ public class BluetoothDetailsHeaderController extends BluetoothDetailsController
private LocalBluetoothManager mLocalManager;
private CachedBluetoothDeviceManager mDeviceManager;
public BluetoothDetailsHeaderController(Context context, PreferenceFragment fragment,
public BluetoothDetailsHeaderController(Context context, PreferenceFragmentCompat fragment,
CachedBluetoothDevice device, Lifecycle lifecycle,
LocalBluetoothManager bluetoothManager) {
super(context, fragment, device, lifecycle);

9
src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
View File

@@ -22,23 +22,24 @@ import com.android.settings.R;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.FooterPreferenceMixin;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
/**
* This class adds the device MAC address to a footer.
*/
public class BluetoothDetailsMacAddressController extends BluetoothDetailsController {
FooterPreferenceMixin mFooterPreferenceMixin;
FooterPreferenceMixinCompat mFooterPreferenceMixin;
FooterPreference mFooterPreference;
public BluetoothDetailsMacAddressController(Context context,
PreferenceFragment fragment,
PreferenceFragmentCompat fragment,
CachedBluetoothDevice device,
Lifecycle lifecycle) {
super(context, fragment, device, lifecycle);
mFooterPreferenceMixin = new FooterPreferenceMixin(fragment, lifecycle);
mFooterPreferenceMixin = new FooterPreferenceMixinCompat(fragment, lifecycle);
}
@Override

3
src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
View File

@@ -36,6 +36,7 @@ import java.util.List;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
@@ -55,7 +56,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
private CachedBluetoothDevice mCachedDevice;
private PreferenceCategory mProfilesContainer;
public BluetoothDetailsProfilesController(Context context, PreferenceFragment fragment,
public BluetoothDetailsProfilesController(Context context, PreferenceFragmentCompat fragment,
LocalBluetoothManager manager, CachedBluetoothDevice device, Lifecycle lifecycle) {
super(context, fragment, device, lifecycle);
mManager = manager;

2
src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
View File

@@ -120,7 +120,7 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
ArrayList<AbstractPreferenceController> controllers = new ArrayList<>();
if (mCachedDevice != null) {
Lifecycle lifecycle = getLifecycle();
Lifecycle lifecycle = getSettingsLifecycle();
controllers.add(new BluetoothDetailsHeaderController(context, this, mCachedDevice,
lifecycle, mManager));
controllers.add(new BluetoothDetailsButtonsController(context, this, mCachedDevice,

9
src/com/android/settings/bluetooth/BluetoothPairingDialog.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.bluetooth;
import android.annotation.Nullable;
import android.app.Activity;
import android.bluetooth.BluetoothDevice;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -26,12 +25,13 @@ import android.content.IntentFilter;
import android.os.Bundle;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentActivity;
/**
* BluetoothPairingDialog asks the user to enter a PIN / Passkey / simple confirmation
* for pairing with a remote Bluetooth device. It is an activity that appears as a dialog.
*/
public class BluetoothPairingDialog extends Activity {
public class BluetoothPairingDialog extends FragmentActivity {
public static final String FRAGMENT_TAG = "bluetooth.pairing.fragment";
private BluetoothPairingController mBluetoothPairingController;
@@ -70,7 +70,8 @@ public class BluetoothPairingDialog extends Activity {
boolean fragmentFound = true;
// check if the fragment has been preloaded
BluetoothPairingDialogFragment bluetoothFragment =
(BluetoothPairingDialogFragment) getFragmentManager().findFragmentByTag(FRAGMENT_TAG);
(BluetoothPairingDialogFragment) getSupportFragmentManager().
findFragmentByTag(FRAGMENT_TAG);
// dismiss the fragment if it is already used
if (bluetoothFragment != null && (bluetoothFragment.isPairingControllerSet()
|| bluetoothFragment.isPairingDialogActivitySet())) {
@@ -86,7 +87,7 @@ public class BluetoothPairingDialog extends Activity {
bluetoothFragment.setPairingDialogActivity(this);
// pass the fragment to the manager when it is created from scratch
if (!fragmentFound) {
bluetoothFragment.show(getFragmentManager(), FRAGMENT_TAG);
bluetoothFragment.show(getSupportFragmentManager(), FRAGMENT_TAG);
}
/*
* Leave this registered through pause/resume since we still want to

2
src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
View File

@@ -66,7 +66,7 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildControllers(context, getLifecycle());
return buildControllers(context, getSettingsLifecycle());
}
private static List<AbstractPreferenceController> buildControllers(Context context,

2
src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
View File

@@ -92,7 +92,7 @@ public class BluetoothDashboardFragment extends DashboardFragment {
mSwitchBar = activity.getSwitchBar();
mController = new BluetoothSwitchPreferenceController(activity,
new SwitchBarController(mSwitchBar), mFooterPreference);
Lifecycle lifecycle = getLifecycle();
Lifecycle lifecycle = getSettingsLifecycle();
if (lifecycle != null) {
lifecycle.addObserver(mController);
}

2
src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
View File

@@ -66,7 +66,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle());
return buildPreferenceControllers(context, getSettingsLifecycle());
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

9
src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
View File

@@ -36,7 +36,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.FooterPreferenceMixin;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
@@ -52,7 +52,7 @@ public class DiscoverableFooterPreferenceController extends BasePreferenceContro
BroadcastReceiver mBluetoothChangedReceiver;
@VisibleForTesting
LocalBluetoothManager mLocalManager;
private FooterPreferenceMixin mFooterPreferenceMixin;
private FooterPreferenceMixinCompat mFooterPreferenceMixin;
private FooterPreference mPreference;
private LocalBluetoothAdapter mLocalAdapter;
private AlwaysDiscoverable mAlwaysDiscoverable;
@@ -82,11 +82,12 @@ public class DiscoverableFooterPreferenceController extends BasePreferenceContro
}
public void init(DashboardFragment fragment) {
mFooterPreferenceMixin = new FooterPreferenceMixin(fragment, fragment.getLifecycle());
mFooterPreferenceMixin = new FooterPreferenceMixinCompat(fragment,
fragment.getSettingsLifecycle());
}
@VisibleForTesting
void init(FooterPreferenceMixin footerPreferenceMixin, FooterPreference preference,
void init(FooterPreferenceMixinCompat footerPreferenceMixin, FooterPreference preference,
AlwaysDiscoverable alwaysDiscoverable) {
mFooterPreferenceMixin = footerPreferenceMixin;
mPreference = preference;

5
src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
View File

@@ -27,7 +27,7 @@ import com.android.settings.Utils;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.FooterPreferenceMixin;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import com.google.android.collect.Lists;
@@ -49,7 +49,8 @@ public class UsbDefaultFragment extends RadioButtonPickerFragment {
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
super.onCreatePreferences(savedInstanceState, rootKey);
FooterPreferenceMixin footer = new FooterPreferenceMixin(this, this.getLifecycle());
FooterPreferenceMixinCompat footer = new FooterPreferenceMixinCompat(this,
this.getSettingsLifecycle());
FooterPreference pref = footer.createFooterPreference();
pref.setTitle(R.string.usb_default_info);
}

2
src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
View File

@@ -85,7 +85,7 @@ public class UsbDetailsFragment extends DashboardFragment {
mControllers = createControllerList(context, mUsbBackend, this);
mUsbReceiver = new UsbConnectionBroadcastReceiver(context, mUsbConnectionListener,
mUsbBackend);
this.getLifecycle().addObserver(mUsbReceiver);
this.getSettingsLifecycle().addObserver(mUsbReceiver);
return new ArrayList<>(mControllers);
}

2
src/com/android/settings/core/InstrumentedActivity.java
View File

@@ -32,7 +32,7 @@ public abstract class InstrumentedActivity extends ObservableActivity implements
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// Mixin that logs visibility change for activity.
getLifecycle().addObserver(new VisibilityLoggerMixin(getMetricsCategory(),
getSettingsLifecycle().addObserver(new VisibilityLoggerMixin(getMetricsCategory(),
FeatureFactory.getFactory(this).getMetricsFeatureProvider()));
}
}

4
src/com/android/settings/core/InstrumentedFragment.java
View File

@@ -37,8 +37,8 @@ public abstract class InstrumentedFragment extends ObservableFragment implements
mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(),
mMetricsFeatureProvider);
// Mixin that logs visibility change for activity.
getLifecycle().addObserver(mVisibilityLoggerMixin);
getLifecycle().addObserver(new SurveyMixin(this, getClass().getSimpleName()));
getSettingsLifecycle().addObserver(mVisibilityLoggerMixin);
getSettingsLifecycle().addObserver(new SurveyMixin(this, getClass().getSimpleName()));
super.onAttach(context);
}

4
src/com/android/settings/core/InstrumentedPreferenceFragment.java
View File

@@ -53,8 +53,8 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
// Mixin that logs visibility change for activity.
mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(),
mMetricsFeatureProvider);
getLifecycle().addObserver(mVisibilityLoggerMixin);
getLifecycle().addObserver(new SurveyMixin(this, getClass().getSimpleName()));
getSettingsLifecycle().addObserver(mVisibilityLoggerMixin);
getSettingsLifecycle().addObserver(new SurveyMixin(this, getClass().getSimpleName()));
super.onAttach(context);
}

4
src/com/android/settings/dashboard/DashboardAdapter.java
View File

@@ -45,7 +45,7 @@ import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.Tile;
import com.android.settingslib.drawer.TileUtils;
import com.android.settingslib.suggestions.SuggestionControllerMixin;
import com.android.settingslib.suggestions.SuggestionControllerMixinCompat;
import com.android.settingslib.utils.IconCache;
import java.util.List;
@@ -84,7 +84,7 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
};
public DashboardAdapter(Context context, Bundle savedInstanceState,
List<Condition> conditions, SuggestionControllerMixin suggestionControllerMixin,
List<Condition> conditions, SuggestionControllerMixinCompat suggestionControllerMixin,
Lifecycle lifecycle) {
DashboardCategory category = null;

2
src/com/android/settings/dashboard/DashboardFragment.java
View File

@@ -89,7 +89,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
controllers.addAll(uniqueControllerFromXml);
// And wire up with lifecycle.
final Lifecycle lifecycle = getLifecycle();
final Lifecycle lifecycle = getSettingsLifecycle();
uniqueControllerFromXml
.stream()
.filter(controller -> controller instanceof LifecycleObserver)

22
src/com/android/settings/dashboard/DashboardSummary.java
View File

@@ -41,7 +41,7 @@ import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.ActionBarShadowController;
import com.android.settingslib.drawer.CategoryKey;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.suggestions.SuggestionControllerMixin;
import com.android.settingslib.suggestions.SuggestionControllerMixinCompat;
import com.android.settingslib.utils.ThreadUtils;
import java.util.List;
@@ -53,7 +53,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
public class DashboardSummary extends InstrumentedFragment
implements CategoryListener, ConditionListener,
FocusListener, SuggestionControllerMixin.SuggestionControllerHost {
FocusListener, SuggestionControllerMixinCompat.SuggestionControllerHost {
public static final boolean DEBUG = false;
private static final boolean DEBUG_TIMING = false;
private static final int MAX_WAIT_MILLIS = 3000;
@@ -69,7 +69,7 @@ public class DashboardSummary extends InstrumentedFragment
private SummaryLoader mSummaryLoader;
private ConditionManager mConditionManager;
private LinearLayoutManager mLayoutManager;
private SuggestionControllerMixin mSuggestionControllerMixin;
private SuggestionControllerMixinCompat mSuggestionControllerMixin;
private DashboardFeatureProvider mDashboardFeatureProvider;
@VisibleForTesting
boolean mIsOnCategoriesChangedCalled;
@@ -86,14 +86,14 @@ public class DashboardSummary extends InstrumentedFragment
@Override
public void onAttach(Context context) {
super.onAttach(context);
Log.d(TAG, "Creating SuggestionControllerMixin");
Log.d(TAG, "Creating SuggestionControllerMixinCompat");
final SuggestionFeatureProvider suggestionFeatureProvider = FeatureFactory
.getFactory(context)
.getSuggestionFeatureProvider(context);
if (suggestionFeatureProvider.isSuggestionEnabled(context)) {
mSuggestionControllerMixin = new SuggestionControllerMixin(context, this /* host */,
getLifecycle(), suggestionFeatureProvider
.getSuggestionServiceComponent());
mSuggestionControllerMixin = new SuggestionControllerMixinCompat(
context, this /* host */, getSettingsLifecycle(),
suggestionFeatureProvider.getSuggestionServiceComponent());
}
}
@@ -117,7 +117,7 @@ public class DashboardSummary extends InstrumentedFragment
mSummaryLoader = new SummaryLoader(activity, CategoryKey.CATEGORY_HOMEPAGE);
mConditionManager = ConditionManager.get(activity, false);
getLifecycle().addObserver(mConditionManager);
getSettingsLifecycle().addObserver(mConditionManager);
if (savedInstanceState != null) {
mIsOnCategoriesChangedCalled =
savedInstanceState.getBoolean(STATE_CATEGORIES_CHANGE_CALLED);
@@ -209,11 +209,13 @@ public class DashboardSummary extends InstrumentedFragment
mDashboard.setListener(this);
mDashboard.setItemAnimator(new DashboardItemAnimator());
mAdapter = new DashboardAdapter(getContext(), bundle,
mConditionManager.getConditions(), mSuggestionControllerMixin, getLifecycle());
mConditionManager.getConditions(), mSuggestionControllerMixin,
getSettingsLifecycle());
mDashboard.setAdapter(mAdapter);
mSummaryLoader.setSummaryConsumer(mAdapter);
ActionBarShadowController.attachToRecyclerView(
getActivity().findViewById(R.id.search_bar_container), getLifecycle(), mDashboard);
getActivity().findViewById(R.id.search_bar_container), getSettingsLifecycle(),
mDashboard);
rebuildUI();
if (DEBUG_TIMING) {
Log.d(TAG, "onCreateView took "

9
src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
View File

@@ -41,7 +41,7 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
import com.android.settingslib.suggestions.SuggestionControllerMixin;
import com.android.settingslib.suggestions.SuggestionControllerMixinCompat;
import com.android.settingslib.utils.IconCache;
import java.util.ArrayList;
@@ -63,7 +63,7 @@ public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
private final IconCache mCache;
private final ArrayList<String> mSuggestionsShownLogged;
private final SuggestionFeatureProvider mSuggestionFeatureProvider;
private final SuggestionControllerMixin mSuggestionControllerMixin;
private final SuggestionControllerMixinCompat mSuggestionControllerMixin;
private final Callback mCallback;
private final CardConfig mConfig;
@@ -76,8 +76,9 @@ public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
void onSuggestionClosed(Suggestion suggestion);
}
public SuggestionAdapter(Context context, SuggestionControllerMixin suggestionControllerMixin,
Bundle savedInstanceState, Callback callback, Lifecycle lifecycle) {
public SuggestionAdapter(Context context,
SuggestionControllerMixinCompat suggestionControllerMixin, Bundle savedInstanceState,
Callback callback, Lifecycle lifecycle) {
mContext = context;
mSuggestionControllerMixin = suggestionControllerMixin;
mCache = new IconCache(context);

4
src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
View File

@@ -23,7 +23,7 @@ import android.service.settings.suggestions.Suggestion;
import android.util.Pair;
import com.android.settingslib.drawer.Tile;
import com.android.settingslib.suggestions.SuggestionControllerMixin;
import com.android.settingslib.suggestions.SuggestionControllerMixinCompat;
import java.util.List;
@@ -63,7 +63,7 @@ public interface SuggestionFeatureProvider {
/**
* Dismisses a suggestion.
*/
void dismissSuggestion(Context context, SuggestionControllerMixin suggestionMixin,
void dismissSuggestion(Context context, SuggestionControllerMixinCompat suggestionMixin,
Suggestion suggestion);
/**

4
src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
View File

@@ -39,7 +39,7 @@ import com.android.settings.wallpaper.WallpaperSuggestionActivity;
import com.android.settings.wifi.calling.WifiCallingSuggestionActivity;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.drawer.Tile;
import com.android.settingslib.suggestions.SuggestionControllerMixin;
import com.android.settingslib.suggestions.SuggestionControllerMixinCompat;
import java.util.List;
@@ -119,7 +119,7 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider
}
@Override
public void dismissSuggestion(Context context, SuggestionControllerMixin mixin,
public void dismissSuggestion(Context context, SuggestionControllerMixinCompat mixin,
Suggestion suggestion) {
if (mixin == null || suggestion == null || context == null) {
return;

8
src/com/android/settings/datausage/AppDataUsage.java
View File

@@ -45,7 +45,7 @@ import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.net.ChartData;
import com.android.settingslib.net.ChartDataLoader;
import com.android.settingslib.net.ChartDataLoaderCompat;
import com.android.settingslib.net.UidDetail;
import com.android.settingslib.net.UidDetailProvider;
@@ -222,7 +222,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
}
mPolicy = services.mPolicyEditor.getPolicy(mTemplate);
getLoaderManager().restartLoader(LOADER_CHART_DATA,
ChartDataLoader.buildArgs(mTemplate, mAppItem), mChartDataCallbacks);
ChartDataLoaderCompat.buildArgs(mTemplate, mAppItem), mChartDataCallbacks);
updatePrefs();
}
@@ -345,7 +345,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
final Activity activity = getActivity();
final Preference pref = EntityHeaderController
.newInstance(activity, this, null /* header */)
.setRecyclerView(getListView(), getLifecycle())
.setRecyclerView(getListView(), getSettingsLifecycle())
.setUid(uid)
.setHasAppInfoLink(showInfoButton)
.setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
@@ -383,7 +383,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
new LoaderManager.LoaderCallbacks<ChartData>() {
@Override
public Loader<ChartData> onCreateLoader(int id, Bundle args) {
return new ChartDataLoader(getActivity(), mStatsSession, args);
return new ChartDataLoaderCompat(getActivity(), mStatsSession, args);
}
@Override

4
src/com/android/settings/datausage/AppPrefLoader.java
View File

@@ -21,11 +21,11 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.util.ArraySet;
import com.android.settingslib.utils.AsyncLoader;
import com.android.settingslib.utils.AsyncLoaderCompat;
import androidx.preference.Preference;
public class AppPrefLoader extends AsyncLoader<ArraySet<Preference>> {
public class AppPrefLoader extends AsyncLoaderCompat<ArraySet<Preference>> {
private ArraySet<String> mPackages;
private PackageManager mPackageManager;
private Context mPrefContext;

12
src/com/android/settings/datausage/CellDataPreference.java
View File

@@ -14,7 +14,6 @@
package com.android.settings.datausage;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.database.ContentObserver;
@@ -37,15 +36,16 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.CustomDialogPreference;
import com.android.settingslib.CustomDialogPreferenceCompat;
import java.util.List;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog.Builder;
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.PreferenceViewHolder;
public class CellDataPreference extends CustomDialogPreference implements TemplatePreference {
public class CellDataPreference extends CustomDialogPreferenceCompat implements TemplatePreference {
private static final String TAG = "CellDataPreference";
@@ -196,7 +196,7 @@ public class CellDataPreference extends CustomDialogPreference implements Templa
}
@Override
protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
protected void onPrepareDialogBuilder(Builder builder,
DialogInterface.OnClickListener listener) {
if (mMultiSimDialog) {
showMultiSimDialog(builder, listener);
@@ -205,7 +205,7 @@ public class CellDataPreference extends CustomDialogPreference implements Templa
}
}
private void showDisableDialog(AlertDialog.Builder builder,
private void showDisableDialog(Builder builder,
DialogInterface.OnClickListener listener) {
builder.setTitle(null)
.setMessage(R.string.data_usage_disable_mobile)
@@ -213,7 +213,7 @@ public class CellDataPreference extends CustomDialogPreference implements Templa
.setNegativeButton(android.R.string.cancel, null);
}
private void showMultiSimDialog(AlertDialog.Builder builder,
private void showMultiSimDialog(Builder builder,
DialogInterface.OnClickListener listener) {
final SubscriptionInfo currentSir = mSubscriptionManager.getActiveSubscriptionInfo(mSubId);
final SubscriptionInfo nextSir = mSubscriptionManager.getDefaultDataSubscriptionInfo();

2
src/com/android/settings/datausage/DataSaverSummary.java
View File

@@ -70,7 +70,7 @@ public class DataSaverSummary extends SettingsPreferenceFragment
(Application) getContext().getApplicationContext());
mDataSaverBackend = new DataSaverBackend(getContext());
mDataUsageBridge = new AppStateDataUsageBridge(mApplicationsState, this, mDataSaverBackend);
mSession = mApplicationsState.newSession(this, getLifecycle());
mSession = mApplicationsState.newSession(this, getSettingsLifecycle());
}
@Override

12
src/com/android/settings/datausage/DataUsageList.java
View File

@@ -57,8 +57,8 @@ import com.android.settings.datausage.CycleAdapter.SpinnerInterface;
import com.android.settings.widget.LoadingViewController;
import com.android.settingslib.AppItem;
import com.android.settingslib.net.ChartData;
import com.android.settingslib.net.ChartDataLoader;
import com.android.settingslib.net.SummaryForAllUidLoader;
import com.android.settingslib.net.ChartDataLoaderCompat;
import com.android.settingslib.net.SummaryForAllUidLoaderCompat;
import com.android.settingslib.net.UidDetailProvider;
import java.util.ArrayList;
@@ -262,7 +262,7 @@ public class DataUsageList extends DataUsageBase {
// TODO: consider chaining two loaders together instead of reloading
// network history when showing app detail.
getLoaderManager().restartLoader(LOADER_CHART_DATA,
ChartDataLoader.buildArgs(mTemplate, null), mChartDataCallbacks);
ChartDataLoaderCompat.buildArgs(mTemplate, null), mChartDataCallbacks);
// detail mode can change visible menus, invalidate
getActivity().invalidateOptionsMenu();
@@ -326,7 +326,7 @@ public class DataUsageList extends DataUsageBase {
// kick off loader for detailed stats
getLoaderManager().restartLoader(LOADER_SUMMARY,
SummaryForAllUidLoader.buildArgs(mTemplate, start, end), mSummaryCallbacks);
SummaryForAllUidLoaderCompat.buildArgs(mTemplate, start, end), mSummaryCallbacks);
final long totalBytes = entry != null ? entry.rxBytes + entry.txBytes : 0;
final CharSequence totalPhrase = DataUsageUtils.formatDataUsage(context, totalBytes);
@@ -548,7 +548,7 @@ public class DataUsageList extends DataUsageBase {
ChartData>() {
@Override
public Loader<ChartData> onCreateLoader(int id, Bundle args) {
return new ChartDataLoader(getActivity(), mStatsSession, args);
return new ChartDataLoaderCompat(getActivity(), mStatsSession, args);
}
@Override
@@ -572,7 +572,7 @@ public class DataUsageList extends DataUsageBase {
NetworkStats>() {
@Override
public Loader<NetworkStats> onCreateLoader(int id, Bundle args) {
return new SummaryForAllUidLoader(getActivity(), mStatsSession, args);
return new SummaryForAllUidLoaderCompat(getActivity(), mStatsSession, args);
}
@Override

4
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -141,9 +141,9 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
final Activity activity = getActivity();
final ArrayList<AbstractPreferenceController> controllers = new ArrayList<>();
mSummaryController =
new DataUsageSummaryPreferenceController(activity, getLifecycle(), this);
new DataUsageSummaryPreferenceController(activity, getSettingsLifecycle(), this);
controllers.add(mSummaryController);
getLifecycle().addObserver(mSummaryController);
getSettingsLifecycle().addObserver(mSummaryController);
return controllers;
}

2
src/com/android/settings/datausage/UnrestrictedDataAccess.java
View File

@@ -93,7 +93,7 @@ public class UnrestrictedDataAccess extends DashboardFragment {
super.onAttach(context);
mFilter = mShowSystem ? ApplicationsState.FILTER_ALL_ENABLED
: ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER;
use(UnrestrictedDataAccessPreferenceController.class).setSession(getLifecycle());
use(UnrestrictedDataAccessPreferenceController.class).setSession(getSettingsLifecycle());
use(UnrestrictedDataAccessPreferenceController.class).setFilter(mFilter);
}

4
src/com/android/settings/datetime/timezone/model/TimeZoneDataLoader.java
View File

@@ -19,12 +19,12 @@ package com.android.settings.datetime.timezone.model;
import android.content.Context;
import android.os.Bundle;
import com.android.settingslib.utils.AsyncLoader;
import com.android.settingslib.utils.AsyncLoaderCompat;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
public class TimeZoneDataLoader extends AsyncLoader<TimeZoneData> {
public class TimeZoneDataLoader extends AsyncLoaderCompat<TimeZoneData> {
public TimeZoneDataLoader(Context context) {
super(context);

2
src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java
View File

@@ -35,7 +35,7 @@ public class BluetoothA2dpHwOffloadRebootDialog extends InstrumentedDialogFragme
public static void show(DevelopmentSettingsDashboardFragment host,
BluetoothA2dpHwOffloadPreferenceController controller) {
final FragmentManager manager = host.getActivity().getFragmentManager();
final FragmentManager manager = host.getActivity().getSupportFragmentManager();
if (manager.findFragmentByTag(TAG) == null) {
final BluetoothA2dpHwOffloadRebootDialog dialog =
new BluetoothA2dpHwOffloadRebootDialog();

2
src/com/android/settings/development/ClearAdbKeysWarningDialog.java
View File

@@ -34,7 +34,7 @@ public class ClearAdbKeysWarningDialog extends InstrumentedDialogFragment implem
public static final String TAG = "ClearAdbKeysDlg";
public static void show(Fragment host) {
final FragmentManager manager = host.getActivity().getFragmentManager();
final FragmentManager manager = host.getActivity().getSupportFragmentManager();
if (manager.findFragmentByTag(TAG) == null) {
final ClearAdbKeysWarningDialog dialog =
new ClearAdbKeysWarningDialog();

7
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -166,7 +166,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
// Set up master switch
mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
mSwitchBarController = new DevelopmentSwitchBarController(
this /* DevelopmentSettings */, mSwitchBar, mIsAvailable, getLifecycle());
this /* DevelopmentSettings */, mSwitchBar, mIsAvailable,
getSettingsLifecycle());
mSwitchBar.show();
// Restore UI state based on whether developer options is enabled
@@ -318,8 +319,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
mPreferenceControllers = new ArrayList<>();
return null;
}
mPreferenceControllers = buildPreferenceControllers(context, getActivity(), getLifecycle(),
this /* devOptionsDashboardFragment */,
mPreferenceControllers = buildPreferenceControllers(context, getActivity(),
getSettingsLifecycle(), this /* devOptionsDashboardFragment */,
new BluetoothA2dpConfigStore());
return mPreferenceControllers;
}

2
src/com/android/settings/development/DisableLogPersistWarningDialog.java
View File

@@ -38,7 +38,7 @@ public class DisableLogPersistWarningDialog extends InstrumentedDialogFragment i
return;
}
final Fragment hostFragment = (Fragment) host;
final FragmentManager manager = hostFragment.getActivity().getFragmentManager();
final FragmentManager manager = hostFragment.getActivity().getSupportFragmentManager();
if (manager.findFragmentByTag(TAG) == null) {
final DisableLogPersistWarningDialog dialog =
new DisableLogPersistWarningDialog();

2
src/com/android/settings/development/EnableAdbWarningDialog.java
View File

@@ -34,7 +34,7 @@ public class EnableAdbWarningDialog extends InstrumentedDialogFragment implement
public static final String TAG = "EnableAdbDialog";
public static void show(Fragment host) {
final FragmentManager manager = host.getActivity().getFragmentManager();
final FragmentManager manager = host.getActivity().getSupportFragmentManager();
if (manager.findFragmentByTag(TAG) == null) {
final EnableAdbWarningDialog dialog = new EnableAdbWarningDialog();
dialog.setTargetFragment(host, 0 /* requestCode */);

2
src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java
View File

@@ -37,7 +37,7 @@ public class EnableDevelopmentSettingWarningDialog extends InstrumentedDialogFra
final EnableDevelopmentSettingWarningDialog dialog =
new EnableDevelopmentSettingWarningDialog();
dialog.setTargetFragment(host, 0 /* requestCode */);
final FragmentManager manager = host.getActivity().getFragmentManager();
final FragmentManager manager = host.getActivity().getSupportFragmentManager();
if (manager.findFragmentByTag(TAG) == null) {
dialog.show(manager, TAG);
}

2
src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java
View File

@@ -34,7 +34,7 @@ public class EnableOemUnlockSettingWarningDialog extends InstrumentedDialogFragm
public static final String TAG = "EnableOemUnlockDlg";
public static void show(Fragment host) {
final FragmentManager manager = host.getActivity().getFragmentManager();
final FragmentManager manager = host.getActivity().getSupportFragmentManager();
if (manager.findFragmentByTag(TAG) == null) {
final EnableOemUnlockSettingWarningDialog dialog =
new EnableOemUnlockSettingWarningDialog();

6
src/com/android/settings/development/featureflags/FeatureFlagFooterPreferenceController.java
View File

@@ -22,18 +22,18 @@ import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.widget.FooterPreferenceMixin;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
public class FeatureFlagFooterPreferenceController extends BasePreferenceController
implements LifecycleObserver, OnStart {
private FooterPreferenceMixin mFooterMixin;
private FooterPreferenceMixinCompat mFooterMixin;
public FeatureFlagFooterPreferenceController(Context context) {
super(context, "feature_flag_footer_pref");
}
public void setFooterMixin(FooterPreferenceMixin mixin) {
public void setFooterMixin(FooterPreferenceMixinCompat mixin) {
mFooterMixin = mixin;
}

2
src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java
View File

@@ -65,7 +65,7 @@ public class FeatureFlagsDashboard extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPrefControllers(context, getLifecycle());
return buildPrefControllers(context, getSettingsLifecycle());
}
private static List<AbstractPreferenceController> buildPrefControllers(Context context,

2
src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
View File

@@ -203,7 +203,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
setTitle();
// Valid options may have changed
getFragmentManager().invalidateOptionsMenu();
getActivity().invalidateOptionsMenu();
final Context context = getActivity();
final PreferenceScreen screen = getPreferenceScreen();

4
src/com/android/settings/deviceinfo/StorageDashboardFragment.java
View File

@@ -105,7 +105,7 @@ public class StorageDashboardFragment extends DashboardFragment
void initializeOptionsMenu(Activity activity) {
mOptionMenuController = new PrivateVolumeOptionMenuController(
activity, mVolume, activity.getPackageManager());
getLifecycle().addObserver(mOptionMenuController);
getSettingsLifecycle().addObserver(mOptionMenuController);
setHasOptionsMenu(true);
activity.invalidateOptionsMenu();
}
@@ -119,7 +119,7 @@ public class StorageDashboardFragment extends DashboardFragment
final Activity activity = getActivity();
EntityHeaderController.newInstance(activity, this /*fragment*/,
null /* header view */)
.setRecyclerView(getListView(), getLifecycle())
.setRecyclerView(getListView(), getSettingsLifecycle())
.styleActionBar(activity);
}

5
src/com/android/settings/deviceinfo/StorageWizardBase.java
View File

@@ -22,7 +22,6 @@ import static com.android.settings.deviceinfo.StorageSettings.TAG;
import android.annotation.LayoutRes;
import android.annotation.NonNull;
import android.app.Activity;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
@@ -48,7 +47,9 @@ import java.text.NumberFormat;
import java.util.List;
import java.util.Objects;
public abstract class StorageWizardBase extends Activity {
import androidx.fragment.app.FragmentActivity;
public abstract class StorageWizardBase extends FragmentActivity {
protected static final String EXTRA_FORMAT_FORGET_UUID = "format_forget_uuid";
protected static final String EXTRA_FORMAT_PRIVATE = "format_private";
protected static final String EXTRA_FORMAT_SLOW = "format_slow";

14
src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java
View File

@@ -20,7 +20,6 @@ import static android.os.storage.DiskInfo.EXTRA_DISK_ID;
import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_FORGET_UUID;
import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_PRIVATE;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
@@ -34,22 +33,24 @@ import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import androidx.fragment.app.FragmentActivity;
public class StorageWizardFormatConfirm extends InstrumentedDialogFragment {
private static final String TAG_FORMAT_WARNING = "format_warning";
public static void showPublic(Activity activity, String diskId) {
public static void showPublic(FragmentActivity activity, String diskId) {
show(activity, diskId, null, false);
}
public static void showPublic(Activity activity, String diskId, String forgetUuid) {
public static void showPublic(FragmentActivity activity, String diskId, String forgetUuid) {
show(activity, diskId, forgetUuid, false);
}
public static void showPrivate(Activity activity, String diskId) {
public static void showPrivate(FragmentActivity activity, String diskId) {
show(activity, diskId, null, true);
}
private static void show(Activity activity, String diskId, String formatForgetUuid,
private static void show(FragmentActivity activity, String diskId, String formatForgetUuid,
boolean formatPrivate) {
final Bundle args = new Bundle();
args.putString(EXTRA_DISK_ID, diskId);
@@ -58,7 +59,8 @@ public class StorageWizardFormatConfirm extends InstrumentedDialogFragment {
final StorageWizardFormatConfirm fragment = new StorageWizardFormatConfirm();
fragment.setArguments(args);
fragment.showAllowingStateLoss(activity.getFragmentManager(), TAG_FORMAT_WARNING);
// TODO (b/111150236) : Need to check it again.
fragment.show(activity.getSupportFragmentManager(), TAG_FORMAT_WARNING);
}
@Override

7
src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
View File

@@ -59,7 +59,8 @@ public class StorageWizardFormatProgress extends StorageWizardBase {
setHeaderText(R.string.storage_wizard_format_progress_title, getDiskShortDescription());
setBodyText(R.string.storage_wizard_format_progress_body, getDiskDescription());
mTask = (PartitionTask) getLastNonConfigurationInstance();
// TODO (b/111151113) : Need to check it again.
mTask = (PartitionTask) getLastCustomNonConfigurationInstance();
if (mTask == null) {
mTask = new PartitionTask();
mTask.setActivity(this);
@@ -68,9 +69,9 @@ public class StorageWizardFormatProgress extends StorageWizardBase {
mTask.setActivity(this);
}
}
// TODO (b/111151113) : Need to check it again.
@Override
public Object onRetainNonConfigurationInstance() {
public Object onRetainCustomNonConfigurationInstance() {
return mTask;
}

2
src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java
View File

@@ -36,7 +36,7 @@ public class DeviceNameWarningDialog extends InstrumentedDialogFragment
public static final String TAG = "DeviceNameWarningDlg";
public static void show(MyDeviceInfoFragment host) {
final FragmentManager manager = host.getActivity().getFragmentManager();
final FragmentManager manager = host.getActivity().getSupportFragmentManager();
if (manager.findFragmentByTag(TAG) != null) {
return;
}

4
src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
View File

@@ -104,7 +104,7 @@ public class MyDeviceInfoFragment extends DashboardFragment
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getActivity(), this /* fragment */,
getLifecycle());
getSettingsLifecycle());
}
private static List<AbstractPreferenceController> buildPreferenceControllers(
@@ -156,7 +156,7 @@ public class MyDeviceInfoFragment extends DashboardFragment
final Bundle bundle = getArguments();
final EntityHeaderController controller = EntityHeaderController
.newInstance(context, this, appSnippet)
.setRecyclerView(getListView(), getLifecycle())
.setRecyclerView(getListView(), getSettingsLifecycle())
.setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
EntityHeaderController.ActionType.ACTION_NONE);

4
src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
View File

@@ -33,7 +33,7 @@ import android.util.Log;
import android.util.SparseArray;
import com.android.settingslib.applications.StorageStatsSource;
import com.android.settingslib.utils.AsyncLoader;
import com.android.settingslib.utils.AsyncLoaderCompat;
import java.io.IOException;
import java.util.Collections;
@@ -45,7 +45,7 @@ import java.util.List;
* users
*/
public class StorageAsyncLoader
extends AsyncLoader<SparseArray<StorageAsyncLoader.AppsStorageResult>> {
extends AsyncLoaderCompat<SparseArray<StorageAsyncLoader.AppsStorageResult>> {
private UserManager mUserManager;
private static final String TAG = "StorageAsyncLoader";

4
src/com/android/settings/deviceinfo/storage/UserIconLoader.java
View File

@@ -24,12 +24,12 @@ import android.util.SparseArray;
import com.android.internal.util.Preconditions;
import com.android.settings.Utils;
import com.android.settingslib.utils.AsyncLoader;
import com.android.settingslib.utils.AsyncLoaderCompat;
/**
* Fetches a user icon as a loader using a given icon loading lambda.
*/
public class UserIconLoader extends AsyncLoader<SparseArray<Drawable>> {
public class UserIconLoader extends AsyncLoaderCompat<SparseArray<Drawable>> {
private FetchUserIconTask mTask;
/**

4
src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java
View File

@@ -22,13 +22,13 @@ import android.os.storage.VolumeInfo;
import com.android.settingslib.deviceinfo.PrivateStorageInfo;
import com.android.settingslib.deviceinfo.StorageVolumeProvider;
import com.android.settingslib.utils.AsyncLoader;
import com.android.settingslib.utils.AsyncLoaderCompat;
import java.io.IOException;
import androidx.annotation.VisibleForTesting;
public class VolumeSizesLoader extends AsyncLoader<PrivateStorageInfo> {
public class VolumeSizesLoader extends AsyncLoaderCompat<PrivateStorageInfo> {
private StorageVolumeProvider mVolumeProvider;
private StorageStatsManager mStats;
private VolumeInfo mVolume;

4
src/com/android/settings/display/DensityPreference.java
View File

@@ -27,12 +27,12 @@ import android.widget.EditText;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.CustomEditTextPreference;
import com.android.settingslib.CustomEditTextPreferenceCompat;
import com.android.settingslib.display.DisplayDensityUtils;
import java.text.NumberFormat;
public class DensityPreference extends CustomEditTextPreference {
public class DensityPreference extends CustomEditTextPreferenceCompat {
private static final String TAG = "DensityPreference";
public DensityPreference(Context context, AttributeSet attrs) {

6
src/com/android/settings/display/TimeoutListPreference.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.display;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
@@ -33,6 +32,9 @@ import com.android.settingslib.RestrictedLockUtils;
import java.util.ArrayList;
import androidx.appcompat.app.AlertDialog.Builder;
public class TimeoutListPreference extends RestrictedListPreference {
private static final String TAG = "TimeoutListPreference";
private EnforcedAdmin mAdmin;
@@ -46,7 +48,7 @@ public class TimeoutListPreference extends RestrictedListPreference {
}
@Override
protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
protected void onPrepareDialogBuilder(Builder builder,
DialogInterface.OnClickListener listener) {
super.onPrepareDialogBuilder(builder, listener);
if (mAdmin != null) {

4
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
View File

@@ -246,7 +246,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
final Bundle bundle = getArguments();
EntityHeaderController controller = EntityHeaderController
.newInstance(context, this, appSnippet)
.setRecyclerView(getListView(), getLifecycle())
.setRecyclerView(getListView(), getSettingsLifecycle())
.setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
EntityHeaderController.ActionType.ACTION_NONE);
@@ -327,7 +327,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
controllers.add(new BatteryOptimizationPreferenceController(
(SettingsActivity) getActivity(), this, packageName));
mAppButtonsPreferenceController = new AppButtonsPreferenceController(
(SettingsActivity) getActivity(), this, getLifecycle(), packageName, mState,
(SettingsActivity) getActivity(), this, getSettingsLifecycle(), packageName, mState,
REQUEST_UNINSTALL, REQUEST_REMOVE_DEVICE_ADMIN);
controllers.add(mAppButtonsPreferenceController);

5
src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
View File

@@ -36,6 +36,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
/**
@@ -56,14 +57,14 @@ public class BatteryHeaderPreferenceController extends AbstractPreferenceControl
TextView mSummary2;
private final Activity mActivity;
private final PreferenceFragment mHost;
private final PreferenceFragmentCompat mHost;
private final Lifecycle mLifecycle;
private final PowerManager mPowerManager;
private LayoutPreference mBatteryLayoutPref;
public BatteryHeaderPreferenceController(Context context, Activity activity,
PreferenceFragment host, Lifecycle lifecycle) {
PreferenceFragmentCompat host, Lifecycle lifecycle) {
super(context);
mActivity = activity;
mHost = host;

4
src/com/android/settings/fuelgauge/BatteryInfoLoader.java
View File

@@ -19,14 +19,14 @@ import android.content.Context;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settingslib.utils.AsyncLoader;
import com.android.settingslib.utils.AsyncLoaderCompat;
/**
* Loader that can be used by classes to load BatteryInfo in a background thread. This loader will
* automatically grab enhanced battery estimates if available or fall back to the system estimate
* when not available.
*/
public class BatteryInfoLoader extends AsyncLoader<BatteryInfo>{
public class BatteryInfoLoader extends AsyncLoaderCompat<BatteryInfo>{
BatteryStatsHelper mStatsHelper;
private static final String LOG_TAG = "BatteryInfoLoader";

4
src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java
View File

@@ -20,14 +20,14 @@ import android.content.Context;
import android.os.UserManager;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settingslib.utils.AsyncLoader;
import com.android.settingslib.utils.AsyncLoaderCompat;
import androidx.annotation.VisibleForTesting;
/**
* Loader to get new {@link BatteryStatsHelper} in the background
*/
public class BatteryStatsHelperLoader extends AsyncLoader<BatteryStatsHelper> {
public class BatteryStatsHelperLoader extends AsyncLoaderCompat<BatteryStatsHelper> {
@VisibleForTesting
UserManager mUserManager;
@VisibleForTesting

4
src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
View File

@@ -23,13 +23,13 @@ import android.os.SystemClock;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.utils.AsyncLoader;
import com.android.settingslib.utils.AsyncLoaderCompat;
import com.android.settingslib.utils.PowerUtil;
import java.util.ArrayList;
import java.util.List;
public class DebugEstimatesLoader extends AsyncLoader<List<BatteryInfo>> {
public class DebugEstimatesLoader extends AsyncLoaderCompat<List<BatteryInfo>> {
private BatteryStatsHelper mStatsHelper;
public DebugEstimatesLoader(Context context, BatteryStatsHelper statsHelper) {

Some files were not shown because too many files have changed in this diff Show More