diff options
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/applications/ManageApplications.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index ba930380d..5902fc2bd 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -303,13 +303,6 @@ public class ManageApplications extends InstrumentedFragment lv.setItemsCanFocus(true); lv.setTextFilterEnabled(true); mListView = lv; - mApplications = new ApplicationsAdapter(mApplicationsState, this, mFilter); - if (savedInstanceState != null) { - mApplications.mHasReceivedLoadEntries = - savedInstanceState.getBoolean(EXTRA_HAS_ENTRIES, false); - } - mListView.setAdapter(mApplications); - mListView.setRecyclerListener(mApplications); Utils.prepareCustomPreferencesList(container, mRootView, mListView, false); } @@ -320,8 +313,6 @@ public class ManageApplications extends InstrumentedFragment ((PreferenceFrameLayout.LayoutParams) mRootView.getLayoutParams()).removeBorders = true; } - createHeader(); - mResetAppsHelper.onRestoreInstanceState(savedInstanceState); return mRootView; @@ -366,6 +357,14 @@ public class ManageApplications extends InstrumentedFragment FrameLayout pinnedHeader = (FrameLayout) mRootView.findViewById(R.id.pinned_header); AppHeader.createAppHeader(getActivity(), null, mVolumeName, null, pinnedHeader); } + mApplications = new ApplicationsAdapter(mApplicationsState, this, mFilter); + if (savedInstanceState != null) { + mApplications.mHasReceivedLoadEntries = + savedInstanceState.getBoolean(EXTRA_HAS_ENTRIES, false); + } + mListView.setAdapter(mApplications); + mListView.setRecyclerListener(mApplications); + createHeader(); } private int getDefaultFilter() { @@ -623,7 +622,10 @@ public class ManageApplications extends InstrumentedFragment @Override public void onResetCompleted() { - mApplications.mExtraInfoBridge.onPackageListChanged(); + /* mExtraInfoBridge can be null when doing reset app preference without + * any changes on apps */ + if (mApplications.mExtraInfoBridge != null) + mApplications.mExtraInfoBridge.onPackageListChanged(); } static class FilterSpinnerAdapter extends ArrayAdapter<CharSequence> { |