diff options
| author | Brian Attwell <brianattwell@google.com> | 2014-06-18 20:29:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-18 19:24:54 +0000 |
| commit | 0d8acb2cebe37296c37b4e6507afe44fe5666f90 (patch) | |
| tree | 6e44793b6772199f1dfccd1362bd37c1958a61ec | |
| parent | 17982084432886af7dea8fc4dc2c309cef18169e (diff) | |
| parent | 02bc31e7b351281e7ca905dbf7ad72ec4119e2e0 (diff) | |
| download | frameworks_base-0d8acb2cebe37296c37b4e6507afe44fe5666f90.zip frameworks_base-0d8acb2cebe37296c37b4e6507afe44fe5666f90.tar.gz frameworks_base-0d8acb2cebe37296c37b4e6507afe44fe5666f90.tar.bz2 | |
Merge "setSelectedHeader() when switching to fragment"
| -rw-r--r-- | core/java/android/preference/PreferenceActivity.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index 0418049..23b1e2c 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -1194,7 +1194,14 @@ public abstract class PreferenceActivity extends ListActivity implements * @param args Optional arguments to supply to the fragment. */ public void switchToHeader(String fragmentName, Bundle args) { - setSelectedHeader(null); + Header selectedHeader = null; + for (int i = 0; i < mHeaders.size(); i++) { + if (fragmentName.equals(mHeaders.get(i).fragment)) { + selectedHeader = mHeaders.get(i); + break; + } + } + setSelectedHeader(selectedHeader); switchToHeaderInner(fragmentName, args); } |