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

Merge "Fix bug #13084552 Correct list of accounts are not shown when tapping ...on type of accounts(corporate,google etc.,) in Settings under Accounts section"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-02-19 22:18:14 +00:00
committed by Android (Google) Code Review
parent 9a7124e8ac 61a77ab51d
commit e611b8590d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -789,8 +789,10 @@ public class SettingsActivity extends Activity
return;
}
if (header != null && mCurrentHeader != null && header.id == mCurrentHeader.id &&
header.id != R.id.account_add) {
// This is the header we are currently displaying (except "Add Account"). Just make sure
header.id != R.id.account_add &&
!header.fragment.equals(ManageAccountsSettings.class.getName())) {
// This is the header we are currently displaying (except "Add Account" or
// "Corporate"/"Google" Account entries that share the same fragment). Just make sure
// to pop the stack up to its root state.
getFragmentManager().popBackStack(BACK_STACK_PREFS,
FragmentManager.POP_BACK_STACK_INCLUSIVE);