diff options
| author | 2017-02-10 20:02:54 +0000 | |
|---|---|---|
| committer | 2017-02-10 20:02:57 +0000 | |
| commit | ca4e4e5eae6aa7f7e0c995492f48650595544ea4 (patch) | |
| tree | cda89f879d100a75b5a29d408fb7183854854a73 | |
| parent | 600c3f38e076a370ab21ef0d497301f2e249f32c (diff) | |
| parent | eadd5a90843c5fda9b1f973b6f133a9d2e9d984b (diff) | |
Merge "Fix incorrect header highlight when in single-pane."
| -rw-r--r-- | core/java/android/preference/PreferenceActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index 5e7f68b794bf..600d82fe6709 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -602,7 +602,9 @@ public abstract class PreferenceActivity extends ListActivity implements if (mHeaders.size() > 0) { setListAdapter(new HeaderAdapter(this, mHeaders, mPreferenceHeaderItemResId, mPreferenceHeaderRemoveEmptyIcon)); - getListView().setChoiceMode(AbsListView.CHOICE_MODE_SINGLE); + if (!mSinglePane) { + getListView().setChoiceMode(AbsListView.CHOICE_MODE_SINGLE); + } } if (mSinglePane && initialFragment != null && initialTitle != 0) { |