commit 67e87fa4e903306d4e430acd871dbad0c189b06b
author Jason Monk <jmonk@google.com> Wed Jun 01 20:09:00 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 01 20:09:00 2016 +0000
tree 999561222e8fc88c13bac2e9050cae5050d37c86
parent df66d4abf0c994b5f53ec0978ba97e746852e3e9
parent 350a930c68fa35d912e11d319848ac44bd868d59

Merge "onResume -> onStart, onPause -> onStop" into nyc-dev

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 9c8d410..d989535 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -428,15 +428,6 @@
     }
 
     @Override
-    protected void onStart() {
-        super.onStart();
-
-        if (mNeedToRevertToInitialFragment) {
-            revertToInitialFragment();
-        }
-    }
-
-    @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         if (!mDisplaySearch) {
             return false;
@@ -788,8 +779,12 @@
     }
 
     @Override
-    protected void onResume() {
-        super.onResume();
+    protected void onStart() {
+        super.onStart();
+
+        if (mNeedToRevertToInitialFragment) {
+            revertToInitialFragment();
+        }
 
         mDevelopmentPreferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
             @Override
@@ -813,8 +808,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 e08173f..a53f41b 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -110,9 +110,9 @@
     }
 
     @Override
-    public void onResume() {
+    public void onStart() {
         long startTime = System.currentTimeMillis();
-        super.onResume();
+        super.onStart();
 
         ((SettingsDrawerActivity) getActivity()).addCategoryListener(this);
         mSummaryLoader.setListening(true);
@@ -127,13 +127,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);