diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-02-19 22:18:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-19 22:18:15 +0000 |
| commit | e611b8590d8da69bb95e29a7faa5200a95b427f3 (patch) | |
| tree | ab48e964cf9301758f74279615ff7d0fc35b61de | |
| parent | 9a7124e8ac0c052fbc4bb6a14fa63f87fd996eb1 (diff) | |
| parent | 61a77ab51d26e142b3681a020b21366a17a39da7 (diff) | |
| download | packages_apps_Settings-e611b8590d8da69bb95e29a7faa5200a95b427f3.zip packages_apps_Settings-e611b8590d8da69bb95e29a7faa5200a95b427f3.tar.gz packages_apps_Settings-e611b8590d8da69bb95e29a7faa5200a95b427f3.tar.bz2 | |
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"
| -rw-r--r-- | src/com/android/settings/SettingsActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index b4970c1..db44444 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -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); |