1 files changed, 7 insertions, 13 deletions
diff --git a/src/com/android/camera/ui/ListMenu.java b/src/com/android/camera/ui/ListMenu.java
index d83114cce..88ad8fe2f 100644
--- a/src/com/android/camera/ui/ListMenu.java
+++ b/src/com/android/camera/ui/ListMenu.java
@@ -120,8 +120,7 @@ public class ListMenu extends ListView
                         + " position " + position);
             }
             if (position == mHighlighted)
-                view.setBackgroundColor(getContext().getResources()
-                        .getColor(R.color.setting_color));
+                view.setActivated(true);
             return view;
         }
 
@@ -160,7 +159,6 @@ public class ListMenu extends ListView
         ArrayAdapter<ListPreference> mListItemAdapter = new MoreSettingAdapter();
         setAdapter(mListItemAdapter);
         setOnItemClickListener(this);
-        setSelector(android.R.color.transparent);
         // Initialize mEnabled
         mEnabled = new boolean[mListItem.size()];
         for (int i = 0; i < mEnabled.length; i++) {
@@ -183,7 +181,6 @@ public class ListMenu extends ListView
         ArrayAdapter<ListPreference> mListItemAdapter = new MoreSettingAdapter();
         setAdapter(mListItemAdapter);
         setOnItemClickListener(this);
-        setSelector(android.R.color.transparent);
         // Initialize mEnabled
         mEnabled = new boolean[mListItem.size()];
         for (int i = 0; i < mEnabled.length; i++) {
@@ -229,7 +226,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);
                         }
@@ -243,8 +240,7 @@ public class ListMenu extends ListView
     public void resetHighlight() {
         int count = getChildCount();
         for (int i = 0; i < count; i++) {
-            View v = getChildAt(i);
-            v.setBackground(null);
+            getChildAt(i).setActivated(false);
         }
         mHighlighted = -1;
     }
@@ -265,7 +261,7 @@ public class ListMenu extends ListView
             resetHighlight();
             ListPreference pref = mListItem.get(position);
             mHighlighted = position;
-            view.setBackgroundColor(getContext().getResources().getColor(R.color.setting_color));
+            view.setActivated(true);
             mListener.onPreferenceClicked(pref, (int) view.getY());
         }
 
@@ -274,11 +270,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();
             }
         }
     }