commit f4c27c2689bace3065fda604db29327266e815ab
author Jason Monk <jmonk@google.com> Wed Jun 01 17:30:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 01 17:30:13 2016 +0000
tree 2c87ab04fafe7737ef7c876efbc716ac4f5f5e74
parent b925300049818ece4f0ace2adda4c1d425ccef56
parent ad302548ea5a030c2e44eb22a212285493037729

Merge "Fix apps spinner jank." into nyc-dev
am: ad302548ea

* commit 'ad302548ea5a030c2e44eb22a212285493037729':
  Fix apps spinner jank.

Change-Id: I1867f2166dea86a9debd6f4304d6e43a8cbe32aa

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

diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 05e5233..dae5d7a 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -26,6 +26,7 @@
 import android.icu.text.AlphabeticIndex;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.Handler;
 import android.os.LocaleList;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -745,6 +746,8 @@
         private final Context mContext;
         private final ArrayList<View> mActive = new ArrayList<View>();
         private final AppStateBaseBridge mExtraInfoBridge;
+        private final Handler mBgHandler;
+        private final Handler mFgHandler;
         private int mFilterMode;
         private ArrayList<ApplicationsState.AppEntry> mBaseEntries;
         private ArrayList<ApplicationsState.AppEntry> mEntries;
@@ -785,6 +788,8 @@
         public ApplicationsAdapter(ApplicationsState state, ManageApplications manageApplications,
                                    int filterMode) {
             mState = state;
+            mFgHandler = new Handler();
+            mBgHandler = new Handler(mState.getBackgroundLooper());
             mSession = state.newSession(this);
             mManageApplications = manageApplications;
             mContext = manageApplications.getActivity();
@@ -897,17 +902,14 @@
                     comparatorObj = ApplicationsState.ALPHA_COMPARATOR;
                     break;
             }
-            ArrayList<ApplicationsState.AppEntry> entries
-                    = mSession.rebuild(filterObj, comparatorObj);
-            if (entries == null && !eraseold) {
-                // Don't have new list yet, but can continue using the old one.
-                return;
-            }
-            if (mFilterMode == FILTER_APPS_POWER_WHITELIST ||
-                mFilterMode == FILTER_APPS_POWER_WHITELIST_ALL) {
-                entries = removeDuplicateIgnoringUser(entries);
-            }
-            onRebuildComplete(entries);
+            AppFilter finalFilterObj = filterObj;
+            mBgHandler.post(() -> {
+                final ArrayList<AppEntry> entries = mSession.rebuild(finalFilterObj,
+                        comparatorObj, false);
+                if (entries != null) {
+                    mFgHandler.post(() -> onRebuildComplete(entries));
+                }
+            });
         }
 
 
@@ -945,6 +947,10 @@
 
         @Override
         public void onRebuildComplete(ArrayList<AppEntry> entries) {
+            if (mFilterMode == FILTER_APPS_POWER_WHITELIST ||
+                    mFilterMode == FILTER_APPS_POWER_WHITELIST_ALL) {
+                entries = removeDuplicateIgnoringUser(entries);
+            }
             mBaseEntries = entries;
             if (mBaseEntries != null) {
                 mEntries = applyPrefixFilter(mCurFilterPrefix, mBaseEntries);