commit 2110a5b95e788b718b69efeddd969e7bcfe50283
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 17 04:52:08 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 17 04:52:08 2021 +0000
tree 1cc1002c17b9eba0455c51a1ec68c46824dd427f
parent 186254c6bc4510f587d68d9432383ded231c7175
parent 730a573d2844acc0f303b77f5864b5339f29fdca

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

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

diff --git a/src/com/android/settings/applications/HibernatedAppsPreferenceController.java b/src/com/android/settings/applications/HibernatedAppsPreferenceController.java
index bf12b86..898d709 100644
--- a/src/com/android/settings/applications/HibernatedAppsPreferenceController.java
+++ b/src/com/android/settings/applications/HibernatedAppsPreferenceController.java
@@ -61,6 +61,7 @@
     private PreferenceScreen mScreen;
     private int mUnusedCount = 0;
     private boolean mLoadingUnusedApps;
+    private boolean mLoadedUnusedCount;
     private final Executor mBackgroundExecutor;
     private final Executor mMainExecutor;
 
@@ -79,14 +80,15 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return isHibernationEnabled() && mUnusedCount > 0
-                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+        return isHibernationEnabled() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override
     public CharSequence getSummary() {
-        return mContext.getResources().getQuantityString(
-                R.plurals.unused_apps_summary, mUnusedCount, mUnusedCount);
+        return mLoadedUnusedCount
+                ? mContext.getResources().getQuantityString(
+                        R.plurals.unused_apps_summary, mUnusedCount, mUnusedCount)
+                : mContext.getResources().getString(R.string.summary_placeholder);
     }
 
     @Override
@@ -111,8 +113,8 @@
             loadUnusedCount(unusedCount -> {
                 mUnusedCount = unusedCount;
                 mLoadingUnusedApps = false;
+                mLoadedUnusedCount = true;
                 mMainExecutor.execute(() -> {
-                    super.displayPreference(mScreen);
                     Preference pref = mScreen.findPreference(mPreferenceKey);
                     refreshSummary(pref);
                 });