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

Merge "Change the logic for showing "App info" vs "show more""

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-05 18:36:40 +00:00
committed by Android (Google) Code Review
parent e3a6a8dbae daad10b428
commit 658599328e
3 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/applications/RecentAppsPreferenceController.java
View File

@@ -153,8 +153,9 @@ public class RecentAppsPreferenceController extends PreferenceController
@VisibleForTesting
void refreshUi(Context prefContext) {
reloadData();
if (shouldDisplayRecentApps()) {
displayRecentApps(prefContext);
final List<UsageStats> recentApps = getDisplayableRecentAppList();
if (recentApps != null && !recentApps.isEmpty()) {
displayRecentApps(prefContext, recentApps);
} else {
displayOnlyAppInfo();
}
@@ -182,11 +183,10 @@ public class RecentAppsPreferenceController extends PreferenceController
}
}
private void displayRecentApps(Context prefContext) {
private void displayRecentApps(Context prefContext, List<UsageStats> recentApps) {
mCategory.setTitle(R.string.recent_app_category_title);
mSeeAllPref.setTitle(R.string.see_all_apps_title);
mSeeAllPref.setIcon(R.drawable.ic_chevron_right_24dp);
final List<UsageStats> recentApps = getDisplayableRecentAppList();
// Rebind prefs/avoid adding new prefs if possible. Adding/removing prefs causes jank.
// Build a cached preference pool
@@ -276,14 +276,6 @@ public class RecentAppsPreferenceController extends PreferenceController
return recentApps;
}
/**
* Whether or not we should show a list of recent apps, and a see all link.
*/
@VisibleForTesting
boolean shouldDisplayRecentApps() {
return mContext.getResources().getBoolean(R.bool.config_display_recent_apps)
&& mApplicationsState != null && mStats != null && !mStats.isEmpty();
}
/**
* Whether or not the app should be included in recent list.