diff options
Diffstat (limited to 'src/com/android/settings/applications/ManageApplications.java')
| -rw-r--r-- | src/com/android/settings/applications/ManageApplications.java | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index 61c2ebb..5902fc2 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -87,7 +87,8 @@ import java.util.Comparator; * intent. */ public class ManageApplications extends InstrumentedFragment - implements OnItemClickListener, OnItemSelectedListener { + implements OnItemClickListener, OnItemSelectedListener, + ResetAppsHelper.ResetCompletedCallback { static final String TAG = "ManageApplications"; static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); @@ -276,7 +277,7 @@ public class ManageApplications extends InstrumentedFragment mInvalidSizeStr = getActivity().getText(R.string.invalid_size_value); - mResetAppsHelper = new ResetAppsHelper(getActivity()); + mResetAppsHelper = new ResetAppsHelper(getActivity(), this); } @@ -302,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); } @@ -319,8 +313,6 @@ public class ManageApplications extends InstrumentedFragment ((PreferenceFrameLayout.LayoutParams) mRootView.getLayoutParams()).removeBorders = true; } - createHeader(); - mResetAppsHelper.onRestoreInstanceState(savedInstanceState); return mRootView; @@ -365,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() { @@ -538,9 +538,11 @@ public class ManageApplications extends InstrumentedFragment } mOptionsMenu.findItem(R.id.advanced).setVisible(mListType == LIST_TYPE_MAIN); - mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(mListType == LIST_TYPE_STORAGE + mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible( + (mListType == LIST_TYPE_STORAGE || mListType == LIST_TYPE_MAIN) && mSortOrder != R.id.sort_order_alpha); - mOptionsMenu.findItem(R.id.sort_order_size).setVisible(mListType == LIST_TYPE_STORAGE + mOptionsMenu.findItem(R.id.sort_order_size).setVisible( + (mListType == LIST_TYPE_STORAGE || mListType == LIST_TYPE_MAIN) && mSortOrder != R.id.sort_order_size); mOptionsMenu.findItem(R.id.show_system).setVisible(!mShowSystem @@ -618,6 +620,14 @@ public class ManageApplications extends InstrumentedFragment mFilterAdapter.setFilterEnabled(FILTER_APPS_DISABLED, hasDisabledApps); } + @Override + public void onResetCompleted() { + /* 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> { private final ManageApplications mManageApplications; @@ -877,7 +887,8 @@ public class ManageApplications extends InstrumentedFragment Utils.handleLoadingContainer(mManageApplications.mLoadingContainer, mManageApplications.mListContainer, true, true); } - if (mManageApplications.mListType == LIST_TYPE_USAGE_ACCESS) { + if (mManageApplications.mListType == LIST_TYPE_USAGE_ACCESS + || mManageApplications.mListType == LIST_TYPE_STORAGE) { // No enabled or disabled filters for usage access. return; } |