commit 718c84f121c5c5237d346596f1d755e3d45f8d6a
author Jason Monk <jmonk@google.com> Wed Jun 01 16:20:01 2016 -0400
committer Jason Monk <jmonk@google.com> Wed Jun 01 16:20:01 2016 -0400
tree 0222cc0627c4f7e3032f34c3a9271973206d2f27
parent 4080861e75bb001413cab1f8a4ce46cb5a3f259e
parent 67e87fa4e903306d4e430acd871dbad0c189b06b

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

Change-Id: I8c5a79de3176912a1803a481b8b179faf1dad178

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index dc0b222..9a65d3c 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -426,15 +426,6 @@
     }
 
     @Override
-    protected void onStart() {
-        super.onStart();
-
-        if (mNeedToRevertToInitialFragment) {
-            revertToInitialFragment();
-        }
-    }
-
-    @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         if (!mDisplaySearch) {
             return false;
@@ -776,8 +767,12 @@
     }
 
     @Override
-    protected void onResume() {
-        super.onResume();
+    protected void onStart() {
+        super.onStart();
+
+        if (mNeedToRevertToInitialFragment) {
+            revertToInitialFragment();
+        }
 
         mDevelopmentPreferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
             @Override
@@ -801,8 +796,8 @@
     }
 
     @Override
-    protected void onPause() {
-        super.onPause();
+    protected void onStop() {
+        super.onStop();
         unregisterReceiver(mBatteryInfoReceiver);
         unregisterReceiver(mUserAddRemoveReceiver);
         mDynamicIndexableContentMonitor.unregister();

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

diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 0e47897..e04b255 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -100,9 +100,9 @@
     }
 
     @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 @@
                         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);