Merge "Fix incorrect header highlight when in single-pane." (ca4e4e5e) · Commits · e / os / android_frameworks_base

core/java/android/preference/PreferenceActivity.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -602,8 +602,10 @@ public abstract class PreferenceActivity extends ListActivity implements
	if (mHeaders.size() > 0) {		if (mHeaders.size() > 0) {
	setListAdapter(new HeaderAdapter(this, mHeaders, mPreferenceHeaderItemResId,		setListAdapter(new HeaderAdapter(this, mHeaders, mPreferenceHeaderItemResId,
	mPreferenceHeaderRemoveEmptyIcon));		mPreferenceHeaderRemoveEmptyIcon));
			if (!mSinglePane) {
	getListView().setChoiceMode(AbsListView.CHOICE_MODE_SINGLE);		getListView().setChoiceMode(AbsListView.CHOICE_MODE_SINGLE);
	}		}
			}

	if (mSinglePane && initialFragment != null && initialTitle != 0) {		if (mSinglePane && initialFragment != null && initialTitle != 0) {
	CharSequence initialTitleStr = getText(initialTitle);		CharSequence initialTitleStr = getText(initialTitle);