Merge "Fix bug #15080198 Enabling developer options requires restart of settings to enter" (dcb73d82) · Commits · e / os / android_packages_apps_Settings

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);
		}

+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