Fix view index tracking.

As we have a header and a footer view now, the assumption 'pref list
size == child count' doesn't hold anymore.

Change-Id: I1b4ab16907eea758921ccce64af01d2a73e82459

1 files changed, 4 insertions, 6 deletions

diff --git a/src/com/android/camera/ui/ListMenu.java b/src/com/android/camera/ui/ListMenu.java
index 942822fec..bb21f7e0a 100644
--- a/src/com/android/camera/ui/ListMenu.java
+++ b/src/com/android/camera/ui/ListMenu.java
@@ -199,7 +199,7 @@ public class ListMenu extends ListView
                     mEnabled[j] = enable;
                     int offset = getFirstVisiblePosition();
                     if (offset >= 0) {
-                        int indexInView = j - offset;
+                        int indexInView = j + getHeaderViewsCount() - offset;
                         if (getChildCount() > indexInView && indexInView >= 0) {
                             getChildAt(indexInView).setEnabled(enable);
                         }
@@ -244,11 +244,9 @@ public class ListMenu extends ListView
     public void reloadPreference() {
         int count = getChildCount();
         for (int i = 0; i < count; i++) {
-            ListPreference pref = mListItem.get(i);
-            if (pref != null) {
-                ListMenuItem listMenuItem =
-                        (ListMenuItem) getChildAt(i);
-                listMenuItem.reloadPreference();
+            View view = getChildAt(i);
+            if (view instanceof ListMenuItem) {
+                ((ListMenuItem) view).reloadPreference();
             }
         }
     }