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

Commit 422e7c35 authored by Daniel Nishi's avatar Daniel Nishi
Browse files

Update the loading of info for the secondary users. 

Bug: 34715777, 34225103
Test: Settings Robotest
Change-Id: I32bb15ad8bc866c1fd41728e56faa8b09ae11eb6
parent dfed8a2a

src/com/android/settings/Utils.java

+5 −5
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ 


package com.android.settings;



import static android.content.Intent.EXTRA_USER;

import static android.content.Intent.EXTRA_USER_ID;

import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;

import static android.text.format.DateUtils.FORMAT_SHOW_DATE;



import android.annotation.Nullable;

import android.app.ActivityManager;

import android.app.AlertDialog;
@@ -104,11 +109,6 @@ import java.util.Iterator; 
import java.util.List;

import java.util.Locale;



import static android.content.Intent.EXTRA_USER;

import static android.content.Intent.EXTRA_USER_ID;

import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;

import static android.text.format.DateUtils.FORMAT_SHOW_DATE;



public final class Utils extends com.android.settingslib.Utils {



    private static final String TAG = "Settings";

src/com/android/settings/applications/UserManagerWrapper.java

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.settings.applications;



import android.content.pm.UserInfo;



import java.util.List;



/**

src/com/android/settings/deviceinfo/StorageDashboardFragment.java

+56 −4
Original line number Diff line number Diff line
@@ -16,40 +16,50 @@ 


package com.android.settings.deviceinfo;



import android.app.LoaderManager;

import android.content.Context;

import android.content.Loader;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.storage.StorageManager;

import android.os.storage.VolumeInfo;

import android.provider.SearchIndexableResource;

import android.support.annotation.VisibleForTesting;

import android.util.SparseArray;



import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.R;

import com.android.settings.applications.PackageManagerWrapperImpl;

import com.android.settings.applications.UserManagerWrapper;

import com.android.settings.applications.UserManagerWrapperImpl;

import com.android.settings.core.PreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.deviceinfo.storage.SecondaryUserController;

import com.android.settings.deviceinfo.storage.StorageAsyncLoader;

import com.android.settings.deviceinfo.storage.StorageItemPreferenceController;

import com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.applications.StorageStatsSource;

import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.Map;



public class StorageDashboardFragment extends DashboardFragment {

public class StorageDashboardFragment extends DashboardFragment

    implements LoaderManager.LoaderCallbacks<SparseArray<StorageAsyncLoader.AppsStorageResult>> {

    private static final String TAG = "StorageDashboardFrag";

    private static final int APPS_JOB_ID = 0;

    private static final int STORAGE_JOB_ID = 0;



    private VolumeInfo mVolume;



    private StorageSummaryDonutPreferenceController mSummaryController;

    private StorageItemPreferenceController mPreferenceController;

    private List<PreferenceController> mSecondaryUsers;



    private boolean isVolumeValid() {

        return (mVolume != null) && (mVolume.getType() == VolumeInfo.TYPE_PRIVATE)
@@ -59,7 +69,29 @@ public class StorageDashboardFragment extends DashboardFragment { 
    @Override

    public void onResume() {

        super.onResume();

        getLoaderManager().initLoader(APPS_JOB_ID, Bundle.EMPTY, mPreferenceController);

        getLoaderManager().initLoader(STORAGE_JOB_ID, Bundle.EMPTY, this);

    }



    @Override

    public Loader<SparseArray<StorageAsyncLoader.AppsStorageResult>> onCreateLoader(int id,

            Bundle args) {

        Context context = getContext();

        return new StorageAsyncLoader(context,

                new UserManagerWrapperImpl(context.getSystemService(UserManager.class)),

                mVolume.fsUuid,

                new StorageStatsSource(context),

                new PackageManagerWrapperImpl(context.getPackageManager()));

    }



    @Override

    public void onLoadFinished(Loader<SparseArray<StorageAsyncLoader.AppsStorageResult>> loader,

            SparseArray<StorageAsyncLoader.AppsStorageResult> data) {

        mPreferenceController.onLoadFinished(data.get(UserHandle.myUserId()));

        updateSecondaryUserControllers(mSecondaryUsers, data);

    }



    @Override

    public void onLoaderReset(Loader<SparseArray<StorageAsyncLoader.AppsStorageResult>> loader) {

    }



    @Override
@@ -117,7 +149,9 @@ public class StorageDashboardFragment extends DashboardFragment { 


        UserManagerWrapper userManager =

                new UserManagerWrapperImpl(context.getSystemService(UserManager.class));

        SecondaryUserController.addAllSecondaryUserControllers(context, userManager, controllers);

        mSecondaryUsers = SecondaryUserController.getSecondaryUserControllers(context, userManager);

        controllers.addAll(mSecondaryUsers);



        controllers.add(new ManageStoragePreferenceController(context));

        return controllers;

    }
@@ -133,6 +167,24 @@ public class StorageDashboardFragment extends DashboardFragment { 
        return isVolumeValid();

    }



    /**

     * Updates the secondary user controller sizes.

     */

    private void updateSecondaryUserControllers(List<PreferenceController> controllers,

            SparseArray<StorageAsyncLoader.AppsStorageResult> stats) {

        for (int i = 0, size = controllers.size(); i < size; i++) {

            PreferenceController controller = controllers.get(i);

            if (controller instanceof SecondaryUserController) {

                SecondaryUserController userController = (SecondaryUserController) controller;

                int userId = userController.getUser().id;

                StorageAsyncLoader.AppsStorageResult result = stats.get(userId);

                if (result != null) {

                    userController.setSize(result.externalStats.totalBytes);

                }

            }

        }

    }



    /**

     * For Search.

     */

src/com/android/settings/deviceinfo/storage/SecondaryUserController.java

+35 −16
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ package com.android.settings.deviceinfo.storage; 


import android.content.Context;

import android.content.pm.UserInfo;

import android.os.UserManager;

import android.support.annotation.NonNull;

import android.support.annotation.Nullable;

import android.support.annotation.VisibleForTesting;

import android.support.v7.preference.PreferenceGroup;

import android.support.v7.preference.PreferenceScreen;
@@ -27,6 +28,7 @@ import com.android.settings.Utils; 
import com.android.settings.applications.UserManagerWrapper;

import com.android.settings.core.PreferenceController;



import java.util.ArrayList;

import java.util.List;



/**
@@ -37,24 +39,27 @@ public class SecondaryUserController extends PreferenceController { 
    // PreferenceGroupKey to try to add our preference onto.

    private static final String TARGET_PREFERENCE_GROUP_KEY = "pref_secondary_users";

    private static final String PREFERENCE_KEY_BASE = "pref_user_";

    private static final int SIZE_NOT_SET = -1;



    private UserInfo mUser;

    private StorageItemPreferenceAlternate mPreference;

    private @NonNull UserInfo mUser;

    private @Nullable StorageItemPreferenceAlternate mStoragePreference;

    private long mSize;



    /**

     * Adds the appropriate controllers to a controller list for handling all secondary users on

     * a device.

     * @param context Context for initializing the preference controllers.

     * @param controllers List of preference controllers for a Settings fragment.

     * @param userManager UserManagerWrapper for figuring out which controllers to add.

     */

    public static void addAllSecondaryUserControllers(Context context,

            UserManagerWrapper userManager, List<PreferenceController> controllers) {

    public static List<PreferenceController> getSecondaryUserControllers(

            Context context, UserManagerWrapper userManager) {

        List<PreferenceController> controllers = new ArrayList<>();

        UserInfo primaryUser = userManager.getPrimaryUser();

        boolean addedUser = false;

        List<UserInfo> infos = userManager.getUsers();

        for (int i = 0, size = infos.size(); i < size; i++) {

            UserInfo info = infos.get(i);

            if (Utils.isProfileOf(primaryUser, info)) {

            if (info == null || Utils.isProfileOf(primaryUser, info)) {

                continue;

            }
@@ -65,6 +70,7 @@ public class SecondaryUserController extends PreferenceController { 
        if (!addedUser) {

            controllers.add(new NoSecondaryUserController(context));

        }

        return controllers;

    }



    /**
@@ -73,22 +79,26 @@ public class SecondaryUserController extends PreferenceController { 
     * @param info {@link UserInfo} for the secondary user which this controllers covers.

     */

    @VisibleForTesting

    SecondaryUserController(Context context, UserInfo info) {

    SecondaryUserController(Context context, @NonNull UserInfo info) {

        super(context);

        mUser = info;

        mSize = SIZE_NOT_SET;

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        if (mPreference == null) {

            mPreference = new StorageItemPreferenceAlternate(mContext);

        if (mStoragePreference == null) {

            mStoragePreference = new StorageItemPreferenceAlternate(mContext);



            PreferenceGroup group =

                    (PreferenceGroup) screen.findPreference(TARGET_PREFERENCE_GROUP_KEY);

            mPreference.setTitle(mUser.name);

            mPreference.setKey(PREFERENCE_KEY_BASE + mUser.id);

            mStoragePreference.setTitle(mUser.name);

            mStoragePreference.setKey(PREFERENCE_KEY_BASE + mUser.id);

            if (mSize != SIZE_NOT_SET) {

                mStoragePreference.setStorageSize(mSize);

            }

            group.setVisible(true);

            group.addPreference(mPreference);

            group.addPreference(mStoragePreference);

        }

    }
@@ -99,7 +109,15 @@ public class SecondaryUserController extends PreferenceController { 


    @Override

    public String getPreferenceKey() {

        return (mPreference != null) ? mPreference.getKey() : null;

        return mStoragePreference != null ? mStoragePreference.getKey() : null;

    }



    /**

     * Returns the user for which this is the secondary user controller.

     */

    @NonNull

    public UserInfo getUser() {

        return mUser;

    }



    /**
@@ -107,8 +125,9 @@ public class SecondaryUserController extends PreferenceController { 
     * @param size Size in bytes.

     */

    public void setSize(long size) {

        if (mPreference != null) {

            mPreference.setStorageSize(size);

        mSize = size;

        if (mStoragePreference != null) {

            mStoragePreference.setStorageSize(mSize);

        }

    }

src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java

+31 −16
Original line number Diff line number Diff line
@@ -21,46 +21,61 @@ import static android.content.pm.ApplicationInfo.CATEGORY_GAME; 


import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.UserInfo;

import android.os.UserHandle;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.SparseArray;



import com.android.settings.applications.PackageManagerWrapper;

import com.android.settings.applications.UserManagerWrapper;

import com.android.settings.utils.AsyncLoader;

import com.android.settingslib.applications.StorageStatsSource;



import java.util.List;

import java.util.Map;



/**

 * AppsAsyncLoader is a Loader which loads app storage information and categories it by the app's

 * specified categorization.

 * StorageAsyncLoader is a Loader which loads categorized app information and external stats for all

 * users

 */

public class StorageAsyncLoader extends AsyncLoader<StorageAsyncLoader.AppsStorageResult> {

    private int mUserId;

public class StorageAsyncLoader

        extends AsyncLoader<SparseArray<StorageAsyncLoader.AppsStorageResult>> {

    private UserManagerWrapper mUserManager;

    private String mUuid;

    private StorageStatsSource mStatsManager;

    private PackageManagerWrapper mPackageManager;



    public StorageAsyncLoader(Context context, int userId, String uuid, StorageStatsSource source,

            PackageManagerWrapper pm) {

    public StorageAsyncLoader(Context context, UserManagerWrapper userManager,

            String uuid, StorageStatsSource source, PackageManagerWrapper pm) {

        super(context);

        mUserId = userId;

        mUserManager = userManager;

        mUuid = uuid;

        mStatsManager = source;

        mPackageManager = pm;

    }



    @Override

    public AppsStorageResult loadInBackground() {

    public SparseArray<AppsStorageResult> loadInBackground() {

        return loadApps();

    }



    private AppsStorageResult loadApps() {

        AppsStorageResult result = new AppsStorageResult();

        ArraySet<Integer> seenUid = new ArraySet<>(); // some apps share a uid

    private SparseArray<AppsStorageResult> loadApps() {

        SparseArray<AppsStorageResult> result = new SparseArray<>();

        List<UserInfo> infos = mUserManager.getUsers();

        for (int i = 0, userCount = infos.size(); i < userCount; i++) {

            UserInfo info = infos.get(i);

            result.put(info.id, getStorageResultForUser(info.id));

        }

        return result;

    }



    private AppsStorageResult getStorageResultForUser(int userId) {

        List<ApplicationInfo> applicationInfos =

                mPackageManager.getInstalledApplicationsAsUser(0, mUserId);

        int size = applicationInfos.size();

        for (int i = 0; i < size; i++) {

                mPackageManager.getInstalledApplicationsAsUser(0, userId);

        ArraySet<Integer> seenUid = new ArraySet<>(); // some apps share a uid

        AppsStorageResult result = new AppsStorageResult();

        for (int i = 0, size = applicationInfos.size(); i < size; i++) {

            ApplicationInfo app = applicationInfos.get(i);

            if (seenUid.contains(app.uid)) {

                continue;
@@ -83,12 +98,12 @@ public class StorageAsyncLoader extends AsyncLoader<StorageAsyncLoader.AppsStora 
            }

        }



        result.externalStats = mStatsManager.getExternalStorageStats(mUuid, UserHandle.of(mUserId));

        result.externalStats = mStatsManager.getExternalStorageStats(mUuid, UserHandle.of(userId));

        return result;

    }



    @Override

    protected void onDiscardResult(AppsStorageResult result) {

    protected void onDiscardResult(SparseArray<AppsStorageResult> result) {

    }



    public static class AppsStorageResult {