summaryrefslogtreecommitdiffstats
path: root/core/java/android/preference
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-14 18:57:14 -0700
committerDianne Hackborn <hackbod@google.com>2010-09-15 11:00:44 -0700
commitd0fa371f276fde32d81c037006941bc93da0bb03 (patch)
treee1b588f0cbfe23ce289ac50784aa3d9960fd7457 /core/java/android/preference
parent53b34a096b6943eef75e8154f6e5b76e4685fa24 (diff)
downloadframeworks_base-d0fa371f276fde32d81c037006941bc93da0bb03.zip
frameworks_base-d0fa371f276fde32d81c037006941bc93da0bb03.tar.gz
frameworks_base-d0fa371f276fde32d81c037006941bc93da0bb03.tar.bz2
Add a new "activated" state to View.
Use this in ListView and GridView if the top view is not checkable. This allows PreferenceActivity to now highlight the current heading that is being shown. Change-Id: I0d28aded9a61a42962b4aece420ae4058712d963
Diffstat (limited to 'core/java/android/preference')
-rw-r--r--core/java/android/preference/PreferenceActivity.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java
index 60d810e..4247ae5 100644
--- a/core/java/android/preference/PreferenceActivity.java
+++ b/core/java/android/preference/PreferenceActivity.java
@@ -241,7 +241,7 @@ public abstract class PreferenceActivity extends ListActivity implements
View view;
if (convertView == null) {
- view = mInflater.inflate(com.android.internal.R.layout.preference_list_item,
+ view = mInflater.inflate(com.android.internal.R.layout.preference_header_item,
parent, false);
holder = new HeaderViewHolder();
holder.icon = (ImageView) view.findViewById(com.android.internal.R.id.icon);
@@ -446,6 +446,9 @@ public abstract class PreferenceActivity extends ListActivity implements
if (!mSinglePane) {
// Multi-pane.
getListView().setChoiceMode(AbsListView.CHOICE_MODE_SINGLE);
+ if (mCurHeader != null) {
+ setSelectedHeader(mCurHeader);
+ }
mPrefsContainer.setVisibility(View.VISIBLE);
}
} else {