Merge "Remove data usage v1 code." (1470ee62) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -2223,7 +2223,7 @@
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.datausage.DataUsageList" />
		android:value="com.android.settings.datausage.DataUsageListV2" />
		</activity>

		<activity

res/xml/app_info_settings.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -65,12 +65,6 @@
		android:selectable="true"
		settings:controller="com.android.settings.applications.appinfo.InstantAppDomainsPreferenceController" />

		<Preference
		android:key="data_settings"
		android:title="@string/data_usage_app_summary_title"
		android:summary="@string/summary_placeholder"
		settings:controller="com.android.settings.applications.appinfo.AppDataUsagePreferenceController" />

		<Preference
		android:key="data_settings_v2"
		android:title="@string/data_usage_app_summary_title"

src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java

deleted100644 → 0

+0 −162

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.applications.appinfo;

		import android.content.Context;
		import android.net.INetworkStatsService;
		import android.net.INetworkStatsSession;
		import android.net.NetworkTemplate;
		import android.os.Bundle;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.text.format.DateUtils;
		import android.text.format.Formatter;
		import android.util.FeatureFlagUtils;

		import androidx.annotation.VisibleForTesting;
		import androidx.loader.app.LoaderManager;
		import androidx.loader.content.Loader;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;

		import com.android.settings.R;
		import com.android.settings.SettingsPreferenceFragment;
		import com.android.settings.Utils;
		import com.android.settings.core.FeatureFlags;
		import com.android.settings.datausage.AppDataUsage;
		import com.android.settings.datausage.DataUsageList;
		import com.android.settings.datausage.DataUsageUtils;
		import com.android.settingslib.AppItem;
		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.ChartDataLoaderCompat;

		/**
		* Deprecated in favor of {@link AppDataUsagePreferenceControllerV2}
		*
		* @deprecated
		*/
		@Deprecated
		public class AppDataUsagePreferenceController extends AppInfoPreferenceControllerBase
		implements LoaderManager.LoaderCallbacks<ChartData>, LifecycleObserver, OnResume, OnPause {

		private ChartData mChartData;
		private INetworkStatsSession mStatsSession;

		public AppDataUsagePreferenceController(Context context,String key) {
		super(context, key);
		}

		@Override
		public int getAvailabilityStatus() {
		if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.DATA_USAGE_V2)) {
		return UNSUPPORTED_ON_DEVICE;
		}
		return isBandwidthControlEnabled() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
		}

		@Override
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		if (isAvailable()) {
		final INetworkStatsService statsService = INetworkStatsService.Stub.asInterface(
		ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
		try {
		mStatsSession = statsService.openSession();
		} catch (RemoteException e) {
		throw new RuntimeException(e);
		}
		}
		}

		@Override
		public void updateState(Preference preference) {
		preference.setSummary(getDataSummary());
		}

		@Override
		public void onResume() {
		if (mStatsSession != null) {
		final int uid = mParent.getAppEntry().info.uid;
		final AppItem app = new AppItem(uid);
		app.addUid(uid);
		mParent.getLoaderManager().restartLoader(mParent.LOADER_CHART_DATA,
		ChartDataLoaderCompat.buildArgs(getTemplate(mContext), app),
		this);
		}
		}

		@Override
		public void onPause() {
		if (mStatsSession != null) {
		mParent.getLoaderManager().destroyLoader(mParent.LOADER_CHART_DATA);
		}
		}

		@Override
		public Loader<ChartData> onCreateLoader(int id, Bundle args) {
		return new ChartDataLoaderCompat(mContext, mStatsSession, args);
		}

		@Override
		public void onLoadFinished(Loader<ChartData> loader, ChartData data) {
		mChartData = data;
		updateState(mPreference);
		}

		@Override
		public void onLoaderReset(Loader<ChartData> loader) {
		// Leave last result.
		}

		@Override
		protected Class<? extends SettingsPreferenceFragment> getDetailFragmentClass() {
		return AppDataUsage.class;
		}

		private CharSequence getDataSummary() {
		if (mChartData != null) {
		final long totalBytes = mChartData.detail.getTotalBytes();
		if (totalBytes == 0) {
		return mContext.getString(R.string.no_data_usage);
		}
		return mContext.getString(R.string.data_summary_format,
		Formatter.formatFileSize(mContext, totalBytes),
		DateUtils.formatDateTime(mContext, mChartData.detail.getStart(),
		DateUtils.FORMAT_SHOW_DATE \| DateUtils.FORMAT_ABBREV_MONTH));
		}
		return mContext.getString(R.string.computing_size);
		}

		private static NetworkTemplate getTemplate(Context context) {
		if (DataUsageUtils.hasReadyMobileRadio(context)) {
		return NetworkTemplate.buildTemplateMobileWildcard();
		}
		if (DataUsageUtils.hasWifiRadio(context)) {
		return NetworkTemplate.buildTemplateWifiWildcard();
		}
		return NetworkTemplate.buildTemplateEthernet();
		}

		@VisibleForTesting
		boolean isBandwidthControlEnabled() {
		return Utils.isBandwidthControlEnabled();
		}

		}

src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerV2.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.net.NetworkTemplate;
		import android.os.Bundle;
		import android.text.format.DateUtils;
		import android.text.format.Formatter;
		import android.util.FeatureFlagUtils;

		import androidx.annotation.VisibleForTesting;
		import androidx.loader.app.LoaderManager;
		@@ -32,7 +31,6 @@ import androidx.preference.PreferenceScreen;
		import com.android.settings.R;
		import com.android.settings.SettingsPreferenceFragment;
		import com.android.settings.Utils;
		import com.android.settings.core.FeatureFlags;
		import com.android.settings.datausage.AppDataUsageV2;
		import com.android.settings.datausage.DataUsageUtils;
		import com.android.settingslib.AppItem;
		@@ -56,9 +54,6 @@ public class AppDataUsagePreferenceControllerV2 extends AppInfoPreferenceControl

		@Override
		public int getAvailabilityStatus() {
		if (!FeatureFlagUtils.isEnabled(mContext, FeatureFlags.DATA_USAGE_V2)) {
		return UNSUPPORTED_ON_DEVICE;
		}
		return isBandwidthControlEnabled() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
		}

src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import android.os.Bundle;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.text.TextUtils;
		import android.util.FeatureFlagUtils;
		import android.util.Log;
		import android.view.Menu;
		import android.view.MenuInflater;
		@@ -49,7 +48,6 @@ import com.android.settings.SettingsPreferenceFragment;
		import com.android.settings.applications.manageapplications.ManageApplications;
		import com.android.settings.applications.specialaccess.pictureinpicture
		.PictureInPictureDetailPreferenceController;
		import com.android.settings.core.FeatureFlags;
		import com.android.settings.core.SubSettingLauncher;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settingslib.RestrictedLockUtilsInternal;
		@@ -141,11 +139,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
		final String packageName = getPackageName();
		use(TimeSpentInAppPreferenceController.class).setPackageName(packageName);

		if (FeatureFlagUtils.isEnabled(context, FeatureFlags.DATA_USAGE_V2)) {
		use(AppDataUsagePreferenceControllerV2.class).setParentFragment(this);
		} else {
		use(AppDataUsagePreferenceController.class).setParentFragment(this);
		}
		final AppInstallerInfoPreferenceController installer =
		use(AppInstallerInfoPreferenceController.class);
		installer.setPackageName(packageName);