diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-10-02 20:19:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-02 20:19:45 +0000 |
| commit | d462e8686697094161930c76a648f75e8c6afd92 (patch) | |
| tree | 94eea00eb35dcaeb8e05d5eb6f9a08d74ec1b970 /src/com/android/settings/Settings.java | |
| parent | 6e5956ebe2b9c3d06ea463bba5c864dad58e0c02 (diff) | |
| parent | 2972c0136de098a7721555821bfb7451324b33ca (diff) | |
| download | packages_apps_Settings-d462e8686697094161930c76a648f75e8c6afd92.zip packages_apps_Settings-d462e8686697094161930c76a648f75e8c6afd92.tar.gz packages_apps_Settings-d462e8686697094161930c76a648f75e8c6afd92.tar.bz2 | |
Merge "Load account type icons in a background thread before scrolling down" into klp-dev
Diffstat (limited to 'src/com/android/settings/Settings.java')
| -rw-r--r-- | src/com/android/settings/Settings.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 87d34c6..6badef8 100644 --- 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 |