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

Remove "v2" from the data usage version 2 code.

Browse Source 
Change-Id: I8ede82029194d1a9a43d00a3de7ec1a8dd77d978
Fixes: 117420679
Test: make RunSettingsRoboTests
This commit is contained in:
Doris Ling
2018-11-30 16:20:32 -08:00
parent d3ad570818
commit 282a0d9222
18 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerV2.java → src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
View File

@@ -31,7 +31,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.datausage.AppDataUsageV2;
import com.android.settings.datausage.AppDataUsage;
import com.android.settings.datausage.DataUsageUtils;
import com.android.settingslib.AppItem;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -42,13 +42,13 @@ import com.android.settingslib.net.NetworkCycleDataForUidLoader;
import java.util.List;
public class AppDataUsagePreferenceControllerV2 extends AppInfoPreferenceControllerBase
public class AppDataUsagePreferenceController extends AppInfoPreferenceControllerBase
implements LoaderManager.LoaderCallbacks<List<NetworkCycleDataForUid>>, LifecycleObserver,
OnResume, OnPause {
private List<NetworkCycleDataForUid> mAppUsageData;
public AppDataUsagePreferenceControllerV2(Context context, String key) {
public AppDataUsagePreferenceController(Context context, String key) {
super(context, key);
}
@@ -110,7 +110,7 @@ public class AppDataUsagePreferenceControllerV2 extends AppInfoPreferenceControl
@Override
protected Class<? extends SettingsPreferenceFragment> getDetailFragmentClass() {
return AppDataUsageV2.class;
return AppDataUsage.class;
}
private CharSequence getDataSummary() {

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

@@ -139,7 +139,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
final String packageName = getPackageName();
use(TimeSpentInAppPreferenceController.class).setPackageName(packageName);
use(AppDataUsagePreferenceControllerV2.class).setParentFragment(this);
use(AppDataUsagePreferenceController.class).setParentFragment(this);
final AppInstallerInfoPreferenceController installer =
use(AppInstallerInfoPreferenceController.class);
installer.setPackageName(packageName);

4
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -57,7 +57,7 @@ import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFrag
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.usb.UsbDetailsFragment;
import com.android.settings.datausage.DataUsageListV2;
import com.android.settings.datausage.DataUsageList;
import com.android.settings.datausage.DataUsageSummary;
import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
import com.android.settings.development.DevelopmentSettingsDashboardFragment;
@@ -258,7 +258,7 @@ public class SettingsGateway {
WebViewAppPicker.class.getName(),
LockscreenDashboardFragment.class.getName(),
BluetoothDeviceDetailsFragment.class.getName(),
DataUsageListV2.class.getName(),
DataUsageList.class.getName(),
ToggleBackupSettingFragment.class.getName(),
PreviouslyConnectedDeviceDashboardFragment.class.getName(),
};

4
src/com/android/settings/datausage/AppDataUsageV2.java → src/com/android/settings/datausage/AppDataUsage.java
View File

@@ -53,10 +53,10 @@ import com.android.settingslib.net.UidDetailProvider;
import java.util.List;
public class AppDataUsageV2 extends DataUsageBaseFragment implements OnPreferenceChangeListener,
public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceChangeListener,
DataSaverBackend.Listener {
private static final String TAG = "AppDataUsageV2";
private static final String TAG = "AppDataUsage";
public static final String ARG_APP_ITEM = "app_item";
public static final String ARG_NETWORK_TEMPLATE = "network_template";

6
src/com/android/settings/datausage/AppDataUsageActivity.java
View File

@@ -59,9 +59,9 @@ public class AppDataUsageActivity extends SettingsActivity {
final Bundle args = new Bundle();
final AppItem appItem = new AppItem(uid);
appItem.addUid(uid);
args.putParcelable(AppDataUsageV2.ARG_APP_ITEM, appItem);
args.putParcelable(AppDataUsage.ARG_APP_ITEM, appItem);
intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
intent.putExtra(EXTRA_SHOW_FRAGMENT, AppDataUsageV2.class.getName());
intent.putExtra(EXTRA_SHOW_FRAGMENT, AppDataUsage.class.getName());
intent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, R.string.app_data_usage);
super.onCreate(savedInstanceState);
@@ -70,6 +70,6 @@ public class AppDataUsageActivity extends SettingsActivity {
@Override
protected boolean isValidFragment(String fragmentName) {
return super.isValidFragment(fragmentName)
|| AppDataUsageV2.class.getName().equals(fragmentName);
|| AppDataUsage.class.getName().equals(fragmentName);
}
}

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

@@ -74,7 +74,7 @@ public class BillingCyclePreference extends Preference implements TemplatePrefer
@Override
public Intent getIntent() {
Bundle args = new Bundle();
args.putParcelable(DataUsageListV2.EXTRA_NETWORK_TEMPLATE, mTemplate);
args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, mTemplate);
return new SubSettingLauncher(getContext())
.setDestination(BillingCycleSettings.class.getName())
.setArguments(args)

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

@@ -105,7 +105,7 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements
mDataUsageController = new DataUsageController(context);
Bundle args = getArguments();
mNetworkTemplate = args.getParcelable(DataUsageListV2.EXTRA_NETWORK_TEMPLATE);
mNetworkTemplate = args.getParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE);
if (mNetworkTemplate == null) {
mNetworkTemplate = DataUsageUtils.getDefaultTemplate(context,
DataUsageUtils.getDefaultSubscriptionId(context));

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

@@ -74,13 +74,13 @@ import java.util.List;
* Panel showing data usage history across various networks, including options
* to inspect based on usage cycle and control through {@link NetworkPolicy}.
*/
public class DataUsageListV2 extends DataUsageBaseFragment {
public class DataUsageList extends DataUsageBaseFragment {
static final String EXTRA_SUB_ID = "sub_id";
static final String EXTRA_NETWORK_TEMPLATE = "network_template";
static final String EXTRA_NETWORK_TYPE = "network_type";
private static final String TAG = "DataUsageListV2";
private static final String TAG = "DataUsageList";
private static final boolean LOGD = false;
private static final String KEY_USAGE_AMOUNT = "usage_amount";
@@ -150,7 +150,7 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
mHeader = setPinnedHeaderView(R.layout.apps_filter_spinner);
mHeader.findViewById(R.id.filter_settings).setOnClickListener(btn -> {
final Bundle args = new Bundle();
args.putParcelable(DataUsageListV2.EXTRA_NETWORK_TEMPLATE, mTemplate);
args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, mTemplate);
new SubSettingLauncher(getContext())
.setDestination(BillingCycleSettings.class.getName())
.setTitleRes(R.string.billing_cycle)
@@ -414,11 +414,11 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
private void startAppDataUsage(AppItem item) {
final Bundle args = new Bundle();
args.putParcelable(AppDataUsageV2.ARG_APP_ITEM, item);
args.putParcelable(AppDataUsageV2.ARG_NETWORK_TEMPLATE, mTemplate);
args.putParcelable(AppDataUsage.ARG_APP_ITEM, item);
args.putParcelable(AppDataUsage.ARG_NETWORK_TEMPLATE, mTemplate);
new SubSettingLauncher(getContext())
.setDestination(AppDataUsageV2.class.getName())
.setDestination(AppDataUsage.class.getName())
.setTitleRes(R.string.app_data_usage)
.setArguments(args)
.setSourceMetricsCategory(getMetricsCategory())

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

@@ -76,13 +76,13 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
public Intent getIntent() {
final Bundle args = new Bundle();
final SubSettingLauncher launcher;
args.putParcelable(DataUsageListV2.EXTRA_NETWORK_TEMPLATE, mTemplate);
args.putInt(DataUsageListV2.EXTRA_SUB_ID, mSubId);
args.putInt(DataUsageListV2.EXTRA_NETWORK_TYPE, mTemplate.isMatchRuleMobile()
args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, mTemplate);
args.putInt(DataUsageList.EXTRA_SUB_ID, mSubId);
args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, mTemplate.isMatchRuleMobile()
? ConnectivityManager.TYPE_MOBILE : ConnectivityManager.TYPE_WIFI);
launcher = new SubSettingLauncher(getContext())
.setArguments(args)
.setDestination(DataUsageListV2.class.getName())
.setDestination(DataUsageList.class.getName())
.setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN);
if (mTemplate.isMatchRuleMobile()) {
launcher.setTitleRes(R.string.app_cellular_data_usage);

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

@@ -208,11 +208,11 @@ public class DataUsageSummaryPreference extends Preference {
private static void launchWifiDataUsage(Context context) {
final Bundle args = new Bundle(1);
args.putParcelable(DataUsageListV2.EXTRA_NETWORK_TEMPLATE,
args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE,
NetworkTemplate.buildTemplateWifiWildcard());
final SubSettingLauncher launcher = new SubSettingLauncher(context)
.setArguments(args)
.setDestination(DataUsageListV2.class.getName())
.setDestination(DataUsageList.class.getName())
.setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN);
launcher.setTitleRes(R.string.wifi_data_usage);
launcher.launch();

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

@@ -81,7 +81,7 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
protected void onClick() {
if (mDataUsageState.isDataSaverBlacklisted) {
// app is blacklisted, launch App Data Usage screen
AppInfoDashboardFragment.startAppInfoFragment(AppDataUsageV2.class,
AppInfoDashboardFragment.startAppInfoFragment(AppDataUsage.class,
R.string.app_data_usage,
null /* arguments */,
mParentFragment,