From eadd5a90843c5fda9b1f973b6f133a9d2e9d984b Mon Sep 17 00:00:00 2001
From: Filip Pavlis <pavlis@google.com>
Date: Fri, 10 Feb 2017 15:51:41 +0000
Subject: Fix incorrect header highlight when in single-pane.

Bug: 35216626
Test: Case will be covered in ag/1761868

Change-Id: I877823762a44d6545c80f4f59b29f190c389ba09
---
 core/java/android/preference/PreferenceActivity.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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) {
-- 
cgit v1.2.3-59-g8ed1b