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

Commit e9f11d6e authored by tmfang's avatar tmfang
Browse files

Improve launch time for app & notification screen 

- We won't query recent apps in getAvailabilityStatus().
And then we do that in background thread.
So, we can launch app & notificatins screen as soon as possible.

- Create a RecentAppStatsMixin class which is responsible
for maintaining the recent apps data.

- Controllers and fragment update their UI after they got
onReloadDataCompleted callback from RecentAppStatsMixin.

Test: manual, robotest
Fixes: 128849426
Fixes: 126453868
Change-Id: I636d5878cb5d53496978fe613c625382d8d382bc
parent 6010c3a9

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

+24 −9
Original line number Diff line number Diff line
@@ -19,39 +19,54 @@ package com.android.settings.applications; 
import android.app.usage.UsageStats;

import android.content.Context;



import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;



import java.util.List;



public class AllAppsInfoPreferenceController extends BasePreferenceController {

public class AllAppsInfoPreferenceController extends BasePreferenceController

        implements RecentAppStatsMixin.RecentAppStatsListener {



    private List<UsageStats> mRecentApps;

    @VisibleForTesting

    Preference mPreference;



    public AllAppsInfoPreferenceController(Context context, String key) {

        super(context, key);

    }



    public void setRecentApps(List<UsageStats> recentApps) {

        mRecentApps = recentApps;

    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

    }



    @Override

    public int getAvailabilityStatus() {

        return mRecentApps == null || mRecentApps.isEmpty() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mPreference = screen.findPreference(getPreferenceKey());

        // In most cases, device has recently opened apps. So, we hide it by default.

        mPreference.setVisible(false);

    }



    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

    public void onReloadDataCompleted(@NonNull List<UsageStats> recentApps) {

        // If device has recently opened apps, we don't show all apps preference.

        if (!recentApps.isEmpty()) {

            mPreference.setVisible(false);

            return;

        }



        mPreference.setVisible(true);

        // Show total number of installed apps as See all's summary.

        new InstalledAppCounter(mContext, InstalledAppCounter.IGNORE_INSTALL_REASON,

                mContext.getPackageManager()) {

            @Override

            protected void onCountComplete(int num) {

                preference.setSummary(mContext.getString(R.string.apps_summary, num));

                mPreference.setSummary(mContext.getString(R.string.apps_summary, num));

            }

        }.execute();

    }

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

+43 −16
Original line number Diff line number Diff line
@@ -17,8 +17,13 @@ 
package com.android.settings.applications;



import android.app.settings.SettingsEnums;

import android.app.usage.UsageStats;

import android.content.Context;

import android.os.Bundle;

import android.provider.SearchIndexableResource;

import android.view.View;



import androidx.annotation.NonNull;



import com.android.settings.R;

import com.android.settings.Utils;
@@ -27,17 +32,21 @@ import com.android.settings.notification.EmergencyBroadcastPreferenceController; 
import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.search.SearchIndexable;

import com.android.settingslib.widget.AppEntitiesHeaderController;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



@SearchIndexable

public class AppAndNotificationDashboardFragment extends DashboardFragment {

public class AppAndNotificationDashboardFragment extends DashboardFragment

        implements RecentAppStatsMixin.RecentAppStatsListener {



    private static final String TAG = "AppAndNotifDashboard";



    private boolean mIsFirstLaunch;

    private View mProgressHeader;

    private View mProgressAnimation;

    private RecentAppStatsMixin mRecentAppStatsMixin;

    private RecentAppsPreferenceController mRecentAppsPreferenceController;

    private AllAppsInfoPreferenceController mAllAppsInfoPreferenceController;
@@ -66,29 +75,40 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment { 
        super.onAttach(context);



        use(SpecialAppAccessPreferenceController.class).setSession(getSettingsLifecycle());



        mRecentAppStatsMixin = new RecentAppStatsMixin(context,

                AppEntitiesHeaderController.MAXIMUM_APPS);

        getSettingsLifecycle().addObserver(mRecentAppStatsMixin);

        mRecentAppStatsMixin.addListener(this);



        mRecentAppsPreferenceController = use(RecentAppsPreferenceController.class);

        mRecentAppsPreferenceController.setFragment(this /* fragment */);

        mRecentAppStatsMixin.addListener(mRecentAppsPreferenceController);



        mAllAppsInfoPreferenceController = use(AllAppsInfoPreferenceController.class);

        mAllAppsInfoPreferenceController.setRecentApps(

                mRecentAppsPreferenceController.getRecentApps());



        mIsFirstLaunch = true;

        mRecentAppStatsMixin.addListener(mAllAppsInfoPreferenceController);

    }



    @Override

    public void onResume() {

        if (!mIsFirstLaunch) {

            mRecentAppsPreferenceController.reloadData();

            mAllAppsInfoPreferenceController.setRecentApps(

                    mRecentAppsPreferenceController.getRecentApps());

    public void onViewCreated(View view, Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);

        mProgressHeader = setPinnedHeaderView(R.layout.progress_header);

        mProgressAnimation = mProgressHeader.findViewById(R.id.progress_bar_animation);

        setLoadingEnabled(false);

    }



        super.onResume();

        mIsFirstLaunch = false;

    @Override

    public void onStart() {

        super.onStart();

        setLoadingEnabled(true);

    }



        if (mRecentAppsPreferenceController.isAvailable()) {

            Utils.setActionBarShadowAnimation(getActivity(), getSettingsLifecycle(), getListView());

    @Override

    public void onReloadDataCompleted(@NonNull List<UsageStats> recentApps) {

        setLoadingEnabled(false);

        if (!recentApps.isEmpty()) {

            Utils.setActionBarShadowAnimation(getActivity(), getSettingsLifecycle(),

                    getListView());

        }

    }
@@ -97,6 +117,13 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment { 
        return buildPreferenceControllers(context);

    }



    private void setLoadingEnabled(boolean enabled) {

        if (mProgressHeader != null && mProgressAnimation != null) {

            mProgressHeader.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);

            mProgressAnimation.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);

        }

    }



    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        controllers.add(new EmergencyBroadcastPreferenceController(context,

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

0 → 100644
+194 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 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;



import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;



import android.app.Application;

import android.app.usage.UsageStats;

import android.app.usage.UsageStatsManager;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.os.PowerManager;

import android.os.UserHandle;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.Log;



import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;



import com.android.settingslib.applications.AppUtils;

import com.android.settingslib.applications.ApplicationsState;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnStart;

import com.android.settingslib.utils.ThreadUtils;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Calendar;

import java.util.Collections;

import java.util.Comparator;

import java.util.List;

import java.util.Map;

import java.util.Set;





public class RecentAppStatsMixin implements Comparator<UsageStats>, LifecycleObserver, OnStart {



    private static final String TAG = "RecentAppStatsMixin";

    private static final Set<String> SKIP_SYSTEM_PACKAGES = new ArraySet<>();



    @VisibleForTesting

    final List<UsageStats> mRecentApps;

    private final int mUserId;

    private final int mMaximumApps;

    private final Context mContext;

    private final PackageManager mPm;

    private final PowerManager mPowerManager;;

    private final UsageStatsManager mUsageStatsManager;

    private final ApplicationsState mApplicationsState;

    private final List<RecentAppStatsListener> mAppStatsListeners;

    private Calendar mCalendar;



    static {

        SKIP_SYSTEM_PACKAGES.addAll(Arrays.asList(

                "android",

                "com.android.phone",

                SETTINGS_PACKAGE_NAME,

                "com.android.systemui",

                "com.android.providers.calendar",

                "com.android.providers.media"

        ));

    }



    public RecentAppStatsMixin(Context context, int maximumApps) {

        mContext = context;

        mMaximumApps = maximumApps;

        mUserId = UserHandle.myUserId();

        mPm = mContext.getPackageManager();

        mPowerManager = mContext.getSystemService(PowerManager.class);

        mUsageStatsManager = mContext.getSystemService(UsageStatsManager.class);

        mApplicationsState = ApplicationsState.getInstance(

                (Application) mContext.getApplicationContext());

        mRecentApps = new ArrayList<>();

        mAppStatsListeners = new ArrayList<>();

    }



    @Override

    public void onStart() {

        ThreadUtils.postOnBackgroundThread(() -> {

            loadDisplayableRecentApps(mMaximumApps);

            for (RecentAppStatsListener listener : mAppStatsListeners) {

                ThreadUtils.postOnMainThread(() -> listener.onReloadDataCompleted(mRecentApps));

            }

        });

    }



    @Override

    public final int compare(UsageStats a, UsageStats b) {

        // return by descending order

        return Long.compare(b.getLastTimeUsed(), a.getLastTimeUsed());

    }



    public void addListener(@NonNull RecentAppStatsListener listener) {

        mAppStatsListeners.add(listener);

    }



    @VisibleForTesting

    void loadDisplayableRecentApps(int number) {

        mRecentApps.clear();

        mCalendar = Calendar.getInstance();

        mCalendar.add(Calendar.DAY_OF_YEAR, -1);

        final List<UsageStats> mStats = mPowerManager.isPowerSaveMode()

                ? new ArrayList<>()

                : mUsageStatsManager.queryUsageStats(

                        UsageStatsManager.INTERVAL_BEST, mCalendar.getTimeInMillis(),

                        System.currentTimeMillis());



        final Map<String, UsageStats> map = new ArrayMap<>();

        final int statCount = mStats.size();

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

            final UsageStats pkgStats = mStats.get(i);

            if (!shouldIncludePkgInRecents(pkgStats)) {

                continue;

            }

            final String pkgName = pkgStats.getPackageName();

            final UsageStats existingStats = map.get(pkgName);

            if (existingStats == null) {

                map.put(pkgName, pkgStats);

            } else {

                existingStats.add(pkgStats);

            }

        }

        final List<UsageStats> packageStats = new ArrayList<>();

        packageStats.addAll(map.values());

        Collections.sort(packageStats, this /* comparator */);

        int count = 0;

        for (UsageStats stat : packageStats) {

            final ApplicationsState.AppEntry appEntry = mApplicationsState.getEntry(

                    stat.getPackageName(), mUserId);

            if (appEntry == null) {

                continue;

            }

            mRecentApps.add(stat);

            count++;

            if (count >= number) {

                break;

            }

        }

    }



    /**

     * Whether or not the app should be included in recent list.

     */

    private boolean shouldIncludePkgInRecents(UsageStats stat) {

        final String pkgName = stat.getPackageName();

        if (stat.getLastTimeUsed() < mCalendar.getTimeInMillis()) {

            Log.d(TAG, "Invalid timestamp (usage time is more than 24 hours ago), skipping "

                    + pkgName);

            return false;

        }



        if (SKIP_SYSTEM_PACKAGES.contains(pkgName)) {

            Log.d(TAG, "System package, skipping " + pkgName);

            return false;

        }

        if (AppUtils.isHiddenSystemModule(mContext, pkgName)) {

            return false;

        }

        final Intent launchIntent = new Intent().addCategory(Intent.CATEGORY_LAUNCHER)

                .setPackage(pkgName);



        if (mPm.resolveActivity(launchIntent, 0) == null) {

            // Not visible on launcher -> likely not a user visible app, skip if non-instant.

            final ApplicationsState.AppEntry appEntry =

                    mApplicationsState.getEntry(pkgName, mUserId);

            if (appEntry == null || appEntry.info == null || !AppUtils.isInstant(appEntry.info)) {

                Log.d(TAG, "Not a user visible or instant app, skipping " + pkgName);

                return false;

            }

        }

        return true;

    }



    public interface RecentAppStatsListener {



        void onReloadDataCompleted(List<UsageStats> recentApps);

    }

}

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

+11 −146
Original line number Diff line number Diff line
@@ -16,24 +16,17 @@ 


package com.android.settings.applications;



import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;



import android.app.Application;

import android.app.settings.SettingsEnums;

import android.app.usage.UsageStats;

import android.app.usage.UsageStatsManager;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.icu.text.RelativeDateTimeFormatter;

import android.os.PowerManager;

import android.os.UserHandle;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.IconDrawableFactory;

import android.util.Log;

import android.view.View;



import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.Fragment;

import androidx.preference.Preference;
@@ -44,35 +37,24 @@ import com.android.settings.applications.appinfo.AppInfoDashboardFragment; 
import com.android.settings.applications.manageapplications.ManageApplications;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.SubSettingLauncher;

import com.android.settingslib.applications.AppUtils;

import com.android.settingslib.applications.ApplicationsState;

import com.android.settingslib.utils.StringUtil;

import com.android.settingslib.widget.AppEntitiesHeaderController;

import com.android.settingslib.widget.AppEntityInfo;

import com.android.settingslib.widget.LayoutPreference;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Calendar;

import java.util.Collections;

import java.util.Comparator;

import java.util.List;

import java.util.Map;

import java.util.Set;



/**

 * This controller displays up to three recently used apps.

 * If there is no recently used app, we only show up an "App Info" preference.

 */

public class RecentAppsPreferenceController extends BasePreferenceController

        implements Comparator<UsageStats> {

        implements RecentAppStatsMixin.RecentAppStatsListener {



    @VisibleForTesting

    static final String KEY_DIVIDER = "recent_apps_divider";



    private static final String TAG = "RecentAppsCtrl";

    private static final Set<String> SKIP_SYSTEM_PACKAGES = new ArraySet<>();



    @VisibleForTesting

    AppEntitiesHeaderController mAppEntitiesController;

    @VisibleForTesting
@@ -80,41 +62,19 @@ public class RecentAppsPreferenceController extends BasePreferenceController 
    @VisibleForTesting

    Preference mDivider;



    private final PackageManager mPm;

    private final UsageStatsManager mUsageStatsManager;

    private final ApplicationsState mApplicationsState;

    private final int mUserId;

    private final IconDrawableFactory mIconDrawableFactory;

    private final PowerManager mPowerManager;



    private Fragment mHost;

    private Calendar mCal;

    private List<UsageStats> mStats;

    private List<UsageStats> mRecentApps;

    private boolean mHasRecentApps;



    static {

        SKIP_SYSTEM_PACKAGES.addAll(Arrays.asList(

                "android",

                "com.android.phone",

                SETTINGS_PACKAGE_NAME,

                "com.android.systemui",

                "com.android.providers.calendar",

                "com.android.providers.media"

        ));

    }



    public RecentAppsPreferenceController(Context context, String key) {

        super(context, key);

        mApplicationsState = ApplicationsState.getInstance(

                (Application) mContext.getApplicationContext());

        mUserId = UserHandle.myUserId();

        mPm = mContext.getPackageManager();

        mIconDrawableFactory = IconDrawableFactory.newInstance(mContext);

        mPowerManager = mContext.getSystemService(PowerManager.class);

        mUsageStatsManager = mContext.getSystemService(UsageStatsManager.class);

        mRecentApps = new ArrayList<>();

        reloadData();

    }



    public void setFragment(Fragment fragment) {
@@ -123,7 +83,7 @@ public class RecentAppsPreferenceController extends BasePreferenceController 


    @Override

    public int getAvailabilityStatus() {

        return mRecentApps.isEmpty() ? CONDITIONALLY_UNAVAILABLE : AVAILABLE;

        return AVAILABLE_UNSEARCHABLE;

    }



    @Override
@@ -131,7 +91,7 @@ public class RecentAppsPreferenceController extends BasePreferenceController 
        super.displayPreference(screen);



        mDivider = screen.findPreference(KEY_DIVIDER);

        mRecentAppsPreference = (LayoutPreference) screen.findPreference(getPreferenceKey());

        mRecentAppsPreference = screen.findPreference(getPreferenceKey());

        final View view = mRecentAppsPreference.findViewById(R.id.app_entities_header);

        mAppEntitiesController = AppEntitiesHeaderController.newInstance(mContext, view)

                .setHeaderTitleRes(R.string.recent_app_category_title)
@@ -143,14 +103,11 @@ public class RecentAppsPreferenceController extends BasePreferenceController 
                            .setSourceMetricsCategory(SettingsEnums.SETTINGS_APP_NOTIF_CATEGORY)

                            .launch();

                });



        refreshUi();

    }



    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);



    public void onReloadDataCompleted(@NonNull List<UsageStats> recentApps) {

        mRecentApps = recentApps;

        refreshUi();

        // Show total number of installed apps as See all's summary.

        new InstalledAppCounter(mContext, InstalledAppCounter.IGNORE_INSTALL_REASON,
@@ -164,38 +121,17 @@ public class RecentAppsPreferenceController extends BasePreferenceController 
        }.execute();

    }



    @Override

    public final int compare(UsageStats a, UsageStats b) {

        // return by descending order

        return Long.compare(b.getLastTimeUsed(), a.getLastTimeUsed());

    }



    List<UsageStats> getRecentApps() {

        return mRecentApps;

    }



    @VisibleForTesting

    void refreshUi() {

        if (mRecentApps != null && !mRecentApps.isEmpty()) {

    private void refreshUi() {

        if (!mRecentApps.isEmpty()) {

            displayRecentApps();

            mRecentAppsPreference.setVisible(true);

            mDivider.setVisible(true);

        } else {

            mDivider.setVisible(false);

            mRecentAppsPreference.setVisible(false);

        }

    }



    @VisibleForTesting

    void reloadData() {

        mCal = Calendar.getInstance();

        mCal.add(Calendar.DAY_OF_YEAR, -1);

        mStats = mPowerManager.isPowerSaveMode()

                ? new ArrayList<>()

                : mUsageStatsManager.queryUsageStats(

                        UsageStatsManager.INTERVAL_BEST, mCal.getTimeInMillis(),

                        System.currentTimeMillis());



        updateDisplayableRecentAppList();

    }



    private void displayRecentApps() {

        int showAppsCount = 0;
@@ -209,8 +145,6 @@ public class RecentAppsPreferenceController extends BasePreferenceController 
                break;

            }

        }

        mAppEntitiesController.apply();

        mDivider.setVisible(true);

    }



    private AppEntityInfo createAppEntity(UsageStats stat) {
@@ -234,73 +168,4 @@ public class RecentAppsPreferenceController extends BasePreferenceController 
                                SettingsEnums.SETTINGS_APP_NOTIF_CATEGORY))

                .build();

    }



    private void updateDisplayableRecentAppList() {

        mRecentApps.clear();

        final Map<String, UsageStats> map = new ArrayMap<>();

        final int statCount = mStats.size();

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

            final UsageStats pkgStats = mStats.get(i);

            if (!shouldIncludePkgInRecents(pkgStats)) {

                continue;

            }

            final String pkgName = pkgStats.getPackageName();

            final UsageStats existingStats = map.get(pkgName);

            if (existingStats == null) {

                map.put(pkgName, pkgStats);

            } else {

                existingStats.add(pkgStats);

            }

        }

        final List<UsageStats> packageStats = new ArrayList<>();

        packageStats.addAll(map.values());

        Collections.sort(packageStats, this /* comparator */);

        int count = 0;

        for (UsageStats stat : packageStats) {

            final ApplicationsState.AppEntry appEntry = mApplicationsState.getEntry(

                    stat.getPackageName(), mUserId);

            if (appEntry == null) {

                continue;

            }

            mRecentApps.add(stat);

            count++;

            if (count >= AppEntitiesHeaderController.MAXIMUM_APPS) {

                break;

            }

        }

    }





    /**

     * Whether or not the app should be included in recent list.

     */

    private boolean shouldIncludePkgInRecents(UsageStats stat) {

        final String pkgName = stat.getPackageName();

        if (stat.getLastTimeUsed() < mCal.getTimeInMillis()) {

            Log.d(TAG, "Invalid timestamp (usage time is more than 24 hours ago), skipping "

                    + pkgName);

            return false;

        }



        if (SKIP_SYSTEM_PACKAGES.contains(pkgName)) {

            Log.d(TAG, "System package, skipping " + pkgName);

            return false;

        }

        if (AppUtils.isHiddenSystemModule(mContext, pkgName)) {

            return false;

        }

        final Intent launchIntent = new Intent().addCategory(Intent.CATEGORY_LAUNCHER)

                .setPackage(pkgName);



        if (mPm.resolveActivity(launchIntent, 0) == null) {

            // Not visible on launcher -> likely not a user visible app, skip if non-instant.

            final ApplicationsState.AppEntry appEntry =

                    mApplicationsState.getEntry(pkgName, mUserId);

            if (appEntry == null || appEntry.info == null || !AppUtils.isInstant(appEntry.info)) {

                Log.d(TAG, "Not a user visible or instant app, skipping " + pkgName);

                return false;

            }

        }

        return true;

    }

}

tests/robotests/src/com/android/settings/applications/AllAppsInfoPreferenceControllerTest.java

+33 −8

File changed.

Preview size limit exceeded, changes collapsed.