Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 49dbc161: Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev

Browse Source 
* commit '49dbc1617c5e0ea56d5568fdcbfe9a771671567a':
  Revert "Fixed group and child view caching in SimpleExpandableListAdapter."
This commit is contained in:
Adam Powell
2012-10-11 14:37:02 -07:00
committed by Android Git Automerger
parent 39b0c29e4f 49dbc1617c
commit 4e5efaef79
1 changed files with 0 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
core/java/android/widget/SimpleExpandableListAdapter.java
View File

@@ -38,8 +38,6 @@ import java.util.Map;
*/ */
public class SimpleExpandableListAdapter extends BaseExpandableListAdapter { public class SimpleExpandableListAdapter extends BaseExpandableListAdapter {
private List<? extends Map<String, ?>> mGroupData; private List<? extends Map<String, ?>> mGroupData;
// Keeps track of if a group is currently expanded or not
private boolean[] mIsGroupExpanded;
private int mExpandedGroupLayout; private int mExpandedGroupLayout;
private int mCollapsedGroupLayout; private int mCollapsedGroupLayout;
private String[] mGroupFrom; private String[] mGroupFrom;
@@ -198,8 +196,6 @@ public class SimpleExpandableListAdapter extends BaseExpandableListAdapter {
int childLayout, int lastChildLayout, String[] childFrom, int childLayout, int lastChildLayout, String[] childFrom,
int[] childTo) { int[] childTo) {
mGroupData = groupData; mGroupData = groupData;
// Initially all groups are not expanded
mIsGroupExpanded = new boolean[groupData.size()];
mExpandedGroupLayout = expandedGroupLayout; mExpandedGroupLayout = expandedGroupLayout;
mCollapsedGroupLayout = collapsedGroupLayout; mCollapsedGroupLayout = collapsedGroupLayout;
mGroupFrom = groupFrom; mGroupFrom = groupFrom;
@@ -302,52 +298,4 @@ public class SimpleExpandableListAdapter extends BaseExpandableListAdapter {
return true; return true;
} }
/**
* {@inheritDoc}
* @return 1 for the last child in a group, 0 for the other children.
*/
@Override
public int getChildType(int groupPosition, int childPosition) {
final int childrenInGroup = getChildrenCount(groupPosition);
return childPosition == childrenInGroup - 1 ? 1 : 0;
}
/**
* {@inheritDoc}
* @return 2, one type for the last child in a group, one for the other children.
*/
@Override
public int getChildTypeCount() {
return 2;
}
/**
* {@inheritDoc}
* @return 1 for an expanded group view, 0 for a collapsed one.
*/
@Override
public int getGroupType(int groupPosition) {
return mIsGroupExpanded[groupPosition] ? 1 : 0;
}
/**
* {@inheritDoc}
* @return 2, one for a collapsed group view, one for an expanded one.
*/
@Override
public int getGroupTypeCount() {
return 2;
}
/** {@inheritDoc} */
@Override
public void onGroupCollapsed(int groupPosition) {
mIsGroupExpanded[groupPosition] = false;
}
/** {@inheritDoc} */
@Override
public void onGroupExpanded(int groupPosition) {
mIsGroupExpanded[groupPosition] = true;
}
} }