From 906ff6fdf989ad4006c74d2bf37fc0e5d4da05f8 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Wed, 16 Apr 2014 18:01:38 -0700
Subject: [PATCH] Improve Preference highlight effect

- restrict the effect to the Preference View itself

Change-Id: I3ab04433e1acecb906d0a458b31314f97b9bda03
---
 res/drawable/preference_highlight.xml         | 23 +++++++++++++++++++
 .../settings/SettingsPreferenceFragment.java  |  5 +---
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 res/drawable/preference_highlight.xml

diff --git a/res/drawable/preference_highlight.xml b/res/drawable/preference_highlight.xml
new file mode 100644
index 00000000000..0b704f73ba7
--- /dev/null
+++ b/res/drawable/preference_highlight.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"
+                android:tint="?android:attr/colorButtonPressed"
+                android:pinned="true">
+    <item android:id="@android:id/mask"
+          android:drawable="@android:color/white" />
+</touch-feedback>
+
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index ad924d6a255..55f4aa50a59 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -23,7 +23,6 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.pm.PackageManager;
-import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.preference.Preference;
@@ -134,9 +133,7 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
     }
 
     private Drawable getHighlightDrawable() {
-        final int[] attrs = new int[] { android.R.attr.selectableItemBackground };
-        TypedArray ta = getActivity().getTheme().obtainStyledAttributes(attrs);
-        return ta.getDrawable(0);
+        return getResources().getDrawable(R.drawable.preference_highlight);
     }
 
     private int findPositionFromKey(String key) {