commit fbb54b8363b66e0b22d519ee20d1a50e8b5340ee
author Fabrice Di Meglio <fdimeglio@google.com> Fri Apr 18 20:48:27 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 18 20:48:27 2014 +0000
tree 3af04cd23d845dcc9932c72480057bbb6cc62224
parent 908a228070678e901ff1775fdd1219f882e2d9fe
parent 8a86d734e53dcbafd86c5cc28679323798ecd8a5

Merge "Improve Preference highlighting"

core/java/android/preference/PreferenceFragment.java

diff --git a/core/java/android/preference/PreferenceFragment.java b/core/java/android/preference/PreferenceFragment.java
index 325b2e6..ff16f6c 100644
--- a/core/java/android/preference/PreferenceFragment.java
+++ b/core/java/android/preference/PreferenceFragment.java
@@ -329,6 +329,11 @@
         if (preferenceScreen != null) {
             preferenceScreen.bind(getListView());
         }
+        onBindPreferences();
+    }
+
+    /** @hide */
+    protected void onBindPreferences() {
     }
 
     /** @hide */

core/java/android/preference/PreferenceGroupAdapter.java

diff --git a/core/java/android/preference/PreferenceGroupAdapter.java b/core/java/android/preference/PreferenceGroupAdapter.java
index 9b41ff0..381a5f0 100644
--- a/core/java/android/preference/PreferenceGroupAdapter.java
+++ b/core/java/android/preference/PreferenceGroupAdapter.java
@@ -20,7 +20,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.preference.Preference.OnPreferenceChangeInternalListener;
@@ -243,6 +242,7 @@
         if (position == mHighlightedPosition && mHighlightedDrawable != null) {
             result.setBackgroundDrawable(mHighlightedDrawable);
         }
+        result.setTag(preference.getKey());
         return result;
     }