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

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);
}