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

Commit 5f995727 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Fix bug #15080198 Enabling developer options requires restart of settings to enter 

- fix Dashboard categories refresh issue

Change-Id: I5bb7fc4a1410df8f5c2d2d13f7625a1ccc8893c3
parent 28ffbd3b

src/com/android/settings/SettingsActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -470,6 +470,7 @@ public class SettingsActivity extends Activity 
            ArrayList<DashboardCategory> categories =

                    savedState.getParcelableArrayList(SAVE_KEY_CATEGORIES);

            if (categories != null) {

                mCategories.clear();

                mCategories.addAll(categories);

                setTitleFromBackStack();

            }
@@ -816,7 +817,7 @@ public class SettingsActivity extends Activity 
     * @param categories The list in which to place the tiles categories.

     */

    private void buildDashboardCategories(List<DashboardCategory> categories) {

        mCategories.clear();

        categories.clear();

        loadCategoriesFromResource(R.xml.dashboard_categories, categories);

        updateTilesList(categories);

    }

src/com/android/settings/dashboard/DashboardSummary.java

+4 −4
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ public class DashboardSummary extends Fragment implements OnAccountsUpdateListen 


        mAuthHelper = ((SettingsActivity) context).getAuthenticatorHelper();



        rebuildUI(getActivity());



        return rootView;

    }
@@ -121,13 +119,15 @@ public class DashboardSummary extends Fragment implements OnAccountsUpdateListen 
    }



    @Override

    public void onStart() {

        super.onStart();

    public void onResume() {

        super.onResume();



        if (!mAccountListenerAdded) {

            AccountManager.get(getActivity()).addOnAccountsUpdatedListener(this, null, false);

            mAccountListenerAdded = true;

        }



        rebuildCategories();

    }



    @Override