resolve merge conflicts of 67e87fa to nyc-mr1-dev (718c84f1) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsActivity.java

+8 −13

Original line number	Diff line number	Diff line
		@@ -425,15 +425,6 @@ public class SettingsActivity extends SettingsDrawerActivity
		Index.getInstance(this).update();
		}

		@Override
		protected void onStart() {
		super.onStart();

		if (mNeedToRevertToInitialFragment) {
		revertToInitialFragment();
		}
		}

		@Override
		public boolean onCreateOptionsMenu(Menu menu) {
		if (!mDisplaySearch) {
		@@ -776,8 +767,12 @@ public class SettingsActivity extends SettingsDrawerActivity
		}

		@Override
		protected void onResume() {
		super.onResume();
		protected void onStart() {
		super.onStart();

		if (mNeedToRevertToInitialFragment) {
		revertToInitialFragment();
		}

		mDevelopmentPreferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
		@Override
		@@ -801,8 +796,8 @@ public class SettingsActivity extends SettingsDrawerActivity
		}

		@Override
		protected void onPause() {
		super.onPause();
		protected void onStop() {
		super.onStop();
		unregisterReceiver(mBatteryInfoReceiver);
		unregisterReceiver(mUserAddRemoveReceiver);
		mDynamicIndexableContentMonitor.unregister();

+5 −5

Original line number	Diff line number	Diff line
		@@ -100,9 +100,9 @@ public class DashboardSummary extends InstrumentedFragment
		}

		@Override
		public void onResume() {
		public void onStart() {
		long startTime = System.currentTimeMillis();
		super.onResume();
		super.onStart();

		((SettingsDrawerActivity) getActivity()).addCategoryListener(this);
		mSummaryLoader.setListening(true);
		@@ -117,13 +117,13 @@ public class DashboardSummary extends InstrumentedFragment
		DashboardAdapter.getSuggestionIdentifier(getContext(), suggestion));
		}
		}
		if (DEBUG_TIMING) Log.d(TAG, "onResume took " + (System.currentTimeMillis() - startTime)
		if (DEBUG_TIMING) Log.d(TAG, "onStart took " + (System.currentTimeMillis() - startTime)
		+ " ms");
		}

		@Override
		public void onPause() {
		super.onPause();
		public void onStop() {
		super.onStop();

		((SettingsDrawerActivity) getActivity()).remCategoryListener(this);
		mSummaryLoader.setListening(false);