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

Commit 6d602480 authored by Sunny Shao's avatar Sunny Shao
Browse files

Enable some settings pages to use paralleled-loading method 

- Here these pages include AppInfoDashboardFragment, ConnectedDeviceDashboardFragment,
  DevelopmentSettingsDashboardFragment, NetworkDashboardFragment, ConfigureNotificationSettings.
- The TimeSpentInAppPreferenceController use the LiveDataController.

Fixes: 135299529
Bug: 137558156
Test: compilation
Change-Id: I455a16536c9966184f1b2bd81d1f1217f3e09f9d
parent 37c795af

res/xml/connected_devices.xml

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
    <Preference

        android:key="connection_preferences"

        android:title="@string/connected_device_connections_title"

        android:summary="@string/summary_placeholder"

        android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"

        settings:allowDividerAbove="true"

        settings:controller="com.android.settings.connecteddevice.AdvancedConnectedDeviceController"/>

res/xml/development_settings.xml

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
        <Preference

            android:key="bug_report_handler"

            android:title="@string/bug_report_handler_title"

            android:summary="@string/summary_placeholder"

            android:fragment="com.android.settings.bugreporthandler.BugReportHandlerPicker" />



        <Preference
@@ -64,6 +65,7 @@ 
        <ListPreference

            android:key="hdcp_checking"

            android:title="@string/hdcp_checking_title"

            android:summary="@string/summary_placeholder"

            android:dialogTitle="@string/hdcp_checking_dialog_title"

            android:entries="@array/hdcp_checking_titles"

            android:entryValues="@array/hdcp_checking_values" />

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

+9 −1
Original line number Diff line number Diff line
@@ -138,7 +138,10 @@ public class AppInfoDashboardFragment extends DashboardFragment 
    public void onAttach(Context context) {

        super.onAttach(context);

        final String packageName = getPackageName();

        use(TimeSpentInAppPreferenceController.class).setPackageName(packageName);

        final TimeSpentInAppPreferenceController timeSpentInAppPreferenceController = use(

                TimeSpentInAppPreferenceController.class);

        timeSpentInAppPreferenceController.setPackageName(packageName);

        timeSpentInAppPreferenceController.initLifeCycleOwner(this);



        use(AppDataUsagePreferenceController.class).setParentFragment(this);

        final AppInstallerInfoPreferenceController installer =
@@ -285,6 +288,11 @@ public class AppInfoDashboardFragment extends DashboardFragment 
        return controllers;

    }



    @Override

    protected boolean isParalleledControllers() {

        return true;

    }



    void addToCallbackList(Callback callback) {

        if (callback != null) {

            mCallbacks.add(callback);

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

+6 −4
Original line number Diff line number Diff line
@@ -29,13 +29,15 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceScreen;



import com.android.settings.applications.ApplicationFeatureProvider;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.LiveDataController;

import com.android.settings.overlay.FeatureFactory;



import java.util.List;



public class TimeSpentInAppPreferenceController extends BasePreferenceController {



/**

 * To Retrieve the time consumption of the application.

 */

public class TimeSpentInAppPreferenceController extends LiveDataController {

    @VisibleForTesting

    static final Intent SEE_TIME_IN_APP_TEMPLATE = new Intent(Settings.ACTION_APP_USAGE_SETTINGS);
@@ -85,7 +87,7 @@ public class TimeSpentInAppPreferenceController extends BasePreferenceController 
    }



    @Override

    public CharSequence getSummary() {

    protected CharSequence getSummaryTextInBackground() {

        return mAppFeatureProvider.getTimeSpentInApp(mPackageName);

    }

src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java

+5 −0
Original line number Diff line number Diff line
@@ -49,6 +49,11 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { 
        return TAG;

    }



    @Override

    protected boolean isParalleledControllers() {

        return true;

    }



    @Override

    public int getHelpResource() {

        return R.string.help_url_connected_devices;