commit 2fed4d4256bd2c77b8b6de50579ec2916649f019
author Alan Viverette <alanv@google.com> Mon Sep 08 12:40:59 2014 -0700
committer Alan Viverette <alanv@google.com> Mon Sep 08 12:40:59 2014 -0700
tree 7c5052c60553d18f1909d932f6b01d33896450fa
parent b5cc01342ea3930ae3bc7592e13c4b5f6f4c646d

Use correct list index for search highlighting

BUG: 14974443
Change-Id: Iad3d3efb2449fc61636c221bde92169293bf5356

src/com/android/settings/SettingsPreferenceFragment.java

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 6cf3330..e87f676 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -230,12 +230,15 @@
                     listView.postDelayed(new Runnable() {
                         @Override
                         public void run() {
-                            final View v = listView.getChildAt(0);
-                            final int centerX = v.getWidth() / 2;
-                            final int centerY = v.getHeight() / 2;
-                            highlight.setHotspot(centerX, centerY);
-                            v.setPressed(true);
-                            v.setPressed(false);
+                            final int index = position - listView.getFirstVisiblePosition();
+                            if (index >= 0 && index < listView.getChildCount()) {
+                                final View v = listView.getChildAt(index);
+                                final int centerX = v.getWidth() / 2;
+                                final int centerY = v.getHeight() / 2;
+                                highlight.setHotspot(centerX, centerY);
+                                v.setPressed(true);
+                                v.setPressed(false);
+                            }
                         }
                     }, DELAY_HIGHLIGHT_DURATION_MILLIS);
                 }