Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61cc95f7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix "show system apps" status lost when switching on/off dark theme"... 

Merge "Fix "show system apps" status lost when switching on/off dark theme" am: df8e9c63 am: c0904055

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



Change-Id: If5a0b0e899b0eea3110319c7df89bb23f932e77e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8b2496eb c0904055

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