Merge "Load account type icons in a background thread before scrolling down" into klp-dev

2013-10-02 20:19:45 +00:00
parent 6e5956ebe2 2972c0136d
commit d462e86866
2 changed files with 23 additions and 5 deletions
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -516,8 +516,10 @@ public class Settings extends PreferenceActivity
     */
    @Override
    public void onBuildHeaders(List<Header> headers) {
-        loadHeadersFromResource(R.xml.settings_headers, headers);
-        updateHeaderList(headers);
+        if (!onIsHidingHeaders()) {
+            loadHeadersFromResource(R.xml.settings_headers, headers);
+            updateHeaderList(headers);
+        }
    }

    private void updateHeaderList(List<Header> target) {
@@ -655,6 +657,7 @@ public class Settings extends PreferenceActivity
                }
            }
            accountHeaders.add(accHeader);
+            mAuthenticatorHelper.preloadDrawableForType(this, accountType);
        }

        // Sort by label