Merge "Fix "show system apps" status lost when switching on/off dark theme" (df8e9c63) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/datausage/UnrestrictedDataAccess.java

+13 −24

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settingslib.applications.AppIconCacheManager;
		import com.android.settingslib.applications.ApplicationsState;
		import com.android.settingslib.applications.ApplicationsState.AppFilter;
		import com.android.settingslib.search.SearchIndexable;

		@SearchIndexable
		@@ -39,14 +38,15 @@ public class UnrestrictedDataAccess extends DashboardFragment {
		private static final String EXTRA_SHOW_SYSTEM = "show_system";

		private boolean mShowSystem;
		private AppFilter mFilter;

		@Override
		public void onCreate(Bundle icicle) {
		super.onCreate(icicle);
		mShowSystem = icicle != null && icicle.getBoolean(EXTRA_SHOW_SYSTEM);

		use(UnrestrictedDataAccessPreferenceController.class).setParentFragment(this);
		use(UnrestrictedDataAccessPreferenceController.class).setFilter(
		mShowSystem ? ApplicationsState.FILTER_ALL_ENABLED
		: ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER);
		use(UnrestrictedDataAccessPreferenceController.class).setSession(getSettingsLifecycle());
		}

		@Override
		@@ -58,17 +58,14 @@ public class UnrestrictedDataAccess extends DashboardFragment {

		@Override
		public boolean onOptionsItemSelected(MenuItem item) {
		switch (item.getItemId()) {
		case MENU_SHOW_SYSTEM:
		if (item.getItemId() == MENU_SHOW_SYSTEM) {
		mShowSystem = !mShowSystem;
		item.setTitle(mShowSystem ? R.string.menu_hide_system : R.string.menu_show_system);
		mFilter = mShowSystem ? ApplicationsState.FILTER_ALL_ENABLED
		: ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER;

		use(UnrestrictedDataAccessPreferenceController.class).setFilter(mFilter);
		use(UnrestrictedDataAccessPreferenceController.class).setFilter(
		mShowSystem ? ApplicationsState.FILTER_ALL_ENABLED
		: ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER);
		use(UnrestrictedDataAccessPreferenceController.class).rebuild();

		break;
		return true;
		}
		return super.onOptionsItemSelected(item);
		}
		@@ -79,18 +76,10 @@ public class UnrestrictedDataAccess extends DashboardFragment {
		outState.putBoolean(EXTRA_SHOW_SYSTEM, mShowSystem);
		}

		@Override
		public void onViewCreated(View view, Bundle savedInstanceState) {
		super.onViewCreated(view, savedInstanceState);
		}

		@Override
		public void onAttach(Context context) {
		super.onAttach(context);
		mFilter = mShowSystem ? ApplicationsState.FILTER_ALL_ENABLED
		: ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER;
		use(UnrestrictedDataAccessPreferenceController.class).setSession(getSettingsLifecycle());
		use(UnrestrictedDataAccessPreferenceController.class).setFilter(mFilter);
		use(UnrestrictedDataAccessPreferenceController.class).setParentFragment(this);
		}

		@Override