Merge "Update "Unused apps" load-in UI" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-06-17 04:52:08 +00:00
committed by Android (Google) Code Review

View File

@@ -61,6 +61,7 @@ public final class HibernatedAppsPreferenceController extends BasePreferenceCont
private PreferenceScreen mScreen; private PreferenceScreen mScreen;
private int mUnusedCount = 0; private int mUnusedCount = 0;
private boolean mLoadingUnusedApps; private boolean mLoadingUnusedApps;
private boolean mLoadedUnusedCount;
private final Executor mBackgroundExecutor; private final Executor mBackgroundExecutor;
private final Executor mMainExecutor; private final Executor mMainExecutor;
@@ -79,14 +80,15 @@ public final class HibernatedAppsPreferenceController extends BasePreferenceCont
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return isHibernationEnabled() && mUnusedCount > 0 return isHibernationEnabled() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
} }
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
return mContext.getResources().getQuantityString( return mLoadedUnusedCount
R.plurals.unused_apps_summary, mUnusedCount, mUnusedCount); ? mContext.getResources().getQuantityString(
R.plurals.unused_apps_summary, mUnusedCount, mUnusedCount)
: mContext.getResources().getString(R.string.summary_placeholder);
} }
@Override @Override
@@ -111,8 +113,8 @@ public final class HibernatedAppsPreferenceController extends BasePreferenceCont
loadUnusedCount(unusedCount -> { loadUnusedCount(unusedCount -> {
mUnusedCount = unusedCount; mUnusedCount = unusedCount;
mLoadingUnusedApps = false; mLoadingUnusedApps = false;
mLoadedUnusedCount = true;
mMainExecutor.execute(() -> { mMainExecutor.execute(() -> {
super.displayPreference(mScreen);
Preference pref = mScreen.findPreference(mPreferenceKey); Preference pref = mScreen.findPreference(mPreferenceKey);
refreshSummary(pref); refreshSummary(pref);
}); });