Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cf7ecc1 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

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

am: 67e87fa4

* commit '67e87fa4':
  onResume -> onStart, onPause -> onStop

Change-Id: I1ca7fdc7246d40c82b3828b5d46762987a0d9a14
parents 61617948 67e87fa4

src/com/android/settings/SettingsActivity.java

+8 −13
Original line number Diff line number Diff line
@@ -427,15 +427,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) {
@@ -788,8 +779,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
@@ -813,8 +808,8 @@ public class SettingsActivity extends SettingsDrawerActivity 
    }



    @Override

    protected void onPause() {

        super.onPause();

    protected void onStop() {

        super.onStop();

        unregisterReceiver(mBatteryInfoReceiver);

        unregisterReceiver(mUserAddRemoveReceiver);

        mDynamicIndexableContentMonitor.unregister();

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

+5 −5
Original line number Diff line number Diff line
@@ -110,9 +110,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);
@@ -127,13 +127,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);