PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I8c5a79de3176912a1803a481b8b179faf1dad178
This commit is contained in:
Jason Monk
2016-06-01 16:20:01 -04:00
parent 4080861e75 67e87fa4e9
commit 718c84f121
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/dashboard/DashboardSummary.java
View File

@@ -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);