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

Merge "Don't return anything from setTitleFromBackStack."

Browse Source
This commit is contained in:
Fan Zhang
2016-03-24 16:46:57 +00:00
committed by Android (Google) Code Review
parent e73d3cfe67 2a7d1c3648
commit a2414963da
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/SettingsActivity.java
View File

@@ -684,7 +684,7 @@ public class SettingsActivity extends SettingsDrawerActivity
} }
/** /**
* Sets the id of the view continaing the main content. Should be called before calling super's * Sets the id of the view containing the main content. Should be called before calling super's
* onCreate. * onCreate.
*/ */
protected void setMainContentId(int contentId) { protected void setMainContentId(int contentId) {
@@ -726,7 +726,7 @@ public class SettingsActivity extends SettingsDrawerActivity
setTitleFromBackStack(); setTitleFromBackStack();
} }
private int setTitleFromBackStack() { private void setTitleFromBackStack() {
final int count = getFragmentManager().getBackStackEntryCount(); final int count = getFragmentManager().getBackStackEntryCount();
if (count == 0) { if (count == 0) {
@@ -735,13 +735,11 @@ public class SettingsActivity extends SettingsDrawerActivity
} else { } else {
setTitle(mInitialTitle); setTitle(mInitialTitle);
} }
return 0; return;
} }
FragmentManager.BackStackEntry bse = getFragmentManager().getBackStackEntryAt(count - 1); FragmentManager.BackStackEntry bse = getFragmentManager().getBackStackEntryAt(count - 1);
setTitleFromBackStackEntry(bse); setTitleFromBackStackEntry(bse);
return count;
} }
private void setTitleFromBackStackEntry(FragmentManager.BackStackEntry bse) { private void setTitleFromBackStackEntry(FragmentManager.BackStackEntry bse) {