diff options
author | Danny Baumann <dannybaumann@web.de> | 2016-04-04 08:44:26 +0200 |
---|---|---|
committer | Danny Baumann <dannybaumann@web.de> | 2016-04-04 08:44:26 +0200 |
commit | 31a10f9a9c0c173a9e24dd272769ade325e7ad49 (patch) | |
tree | f07f7cff72100c80f0f984378db5143c47f461f1 /src | |
parent | 222c665b32fcc14a97494c896c22012d10ddd8a3 (diff) | |
download | android_packages_apps_Snap-31a10f9a9c0c173a9e24dd272769ade325e7ad49.tar.gz android_packages_apps_Snap-31a10f9a9c0c173a9e24dd272769ade325e7ad49.tar.bz2 android_packages_apps_Snap-31a10f9a9c0c173a9e24dd272769ade325e7ad49.zip |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/ui/ListMenu.java | 10 |
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(); } } } |