resolve merge conflicts of 67e87fa to nyc-mr1-dev

Change-Id: I8c5a79de3176912a1803a481b8b179faf1dad178

src/com/android/settings/SettingsActivity.java

@@ -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() {
+    protected void onStart() {
-        super.onResume();
+        super.onStart();
+
+        if (mNeedToRevertToInitialFragment) {
+            revertToInitialFragment();
+        }
 
         mDevelopmentPreferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
             @Override
@@ -801,8 +796,8 @@ public class SettingsActivity extends SettingsDrawerActivity
     }
 
     @Override
-    protected void onPause() {
+    protected void onStop() {
-        super.onPause();
+        super.onStop();
         unregisterReceiver(mBatteryInfoReceiver);
         unregisterReceiver(mUserAddRemoveReceiver);
         mDynamicIndexableContentMonitor.unregister();

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

@@ -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() {
+    public void onStop() {
-        super.onPause();
+        super.onStop();
 
         ((SettingsDrawerActivity) getActivity()).remCategoryListener(this);
         mSummaryLoader.setListening(false);