PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix "show system apps" status lost when switching on/off dark theme" am: df8e9c630a am: c0904055f4 am: 61cc95f7d1

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2253577

Change-Id: Ib54ccf0e5b64a8d1445d3bfdce16456fd1403455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-10-13 15:51:46 +00:00
committed by Automerger Merge Worker
parent 763f3c7521 61cc95f7d1
commit c49d0aacfa
1 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/settings/datausage/UnrestrictedDataAccess.java
View File

@@ -27,7 +27,6 @@ import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.applications.AppIconCacheManager; import com.android.settingslib.applications.AppIconCacheManager;
import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
@SearchIndexable @SearchIndexable
@@ -39,14 +38,15 @@ public class UnrestrictedDataAccess extends DashboardFragment {
private static final String EXTRA_SHOW_SYSTEM = "show_system"; private static final String EXTRA_SHOW_SYSTEM = "show_system";
private boolean mShowSystem; private boolean mShowSystem;
private AppFilter mFilter;
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
mShowSystem = icicle != null && icicle.getBoolean(EXTRA_SHOW_SYSTEM); mShowSystem = icicle != null && icicle.getBoolean(EXTRA_SHOW_SYSTEM);
use(UnrestrictedDataAccessPreferenceController.class).setFilter(
use(UnrestrictedDataAccessPreferenceController.class).setParentFragment(this); mShowSystem ? ApplicationsState.FILTER_ALL_ENABLED
: ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER);
use(UnrestrictedDataAccessPreferenceController.class).setSession(getSettingsLifecycle());
} }
@Override @Override
@@ -58,17 +58,14 @@ public class UnrestrictedDataAccess extends DashboardFragment {
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { if (item.getItemId() == MENU_SHOW_SYSTEM) {
case MENU_SHOW_SYSTEM:
mShowSystem = !mShowSystem; mShowSystem = !mShowSystem;
item.setTitle(mShowSystem ? R.string.menu_hide_system : R.string.menu_show_system); item.setTitle(mShowSystem ? R.string.menu_hide_system : R.string.menu_show_system);
mFilter = mShowSystem ? ApplicationsState.FILTER_ALL_ENABLED use(UnrestrictedDataAccessPreferenceController.class).setFilter(
: ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER; mShowSystem ? ApplicationsState.FILTER_ALL_ENABLED
: ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER);
use(UnrestrictedDataAccessPreferenceController.class).setFilter(mFilter);
use(UnrestrictedDataAccessPreferenceController.class).rebuild(); use(UnrestrictedDataAccessPreferenceController.class).rebuild();
return true;
break;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@@ -79,18 +76,10 @@ public class UnrestrictedDataAccess extends DashboardFragment {
outState.putBoolean(EXTRA_SHOW_SYSTEM, mShowSystem); outState.putBoolean(EXTRA_SHOW_SYSTEM, mShowSystem);
} }
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
}
@Override @Override
public void onAttach(Context context) { public void onAttach(Context context) {
super.onAttach(context); super.onAttach(context);
mFilter = mShowSystem ? ApplicationsState.FILTER_ALL_ENABLED use(UnrestrictedDataAccessPreferenceController.class).setParentFragment(this);
: ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER;
use(UnrestrictedDataAccessPreferenceController.class).setSession(getSettingsLifecycle());
use(UnrestrictedDataAccessPreferenceController.class).setFilter(mFilter);
} }
@Override @Override