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

Commit 282a0d92 authored by Doris Ling's avatar Doris Ling
Browse files

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

Change-Id: I8ede82029194d1a9a43d00a3de7ec1a8dd77d978
Fixes: 117420679
Test: make RunSettingsRoboTests
parent d3ad5708

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.DataUsageListV2" />

                       android:value="com.android.settings.datausage.DataUsageList" />

        </activity>



        <activity

res/xml/app_info_settings.xml

+3 −3
Original line number Diff line number Diff line
@@ -66,10 +66,10 @@ 
        settings:controller="com.android.settings.applications.appinfo.InstantAppDomainsPreferenceController" />



    <Preference

        android:key="data_settings_v2"

        android:key="data_settings"

        android:title="@string/data_usage_app_summary_title"

        android:summary="@string/summary_placeholder"

        settings:controller="com.android.settings.applications.appinfo.AppDataUsagePreferenceControllerV2" />

        settings:controller="com.android.settings.applications.appinfo.AppDataUsagePreferenceController" />



    <Preference

        android:key="time_spent_in_app"

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

+4 −4
Original line number Diff line number Diff line
@@ -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() {

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −2
Original line number Diff line number Diff line
@@ -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(),

    };