drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I4039545e into eclair-mr2

Browse Source 
* changes:
  Fire OnGroupClick events when collapsing a group in ExpandableListView.
This commit is contained in:
Android (Google) Code Review
2009-12-04 17:01:54 -08:00
parent f6683bb559 4039545ed6
commit d1b3988adf
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/widget/ExpandableListView.java
View File

@ -33,7 +33,6 @@ import android.view.ContextMenu;
import android.view.SoundEffectConstants; import android.view.SoundEffectConstants;
import android.view.View; import android.view.View;
import android.view.ContextMenu.ContextMenuInfo; import android.view.ContextMenu.ContextMenuInfo;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.ExpandableListConnector.PositionMetadata; import android.widget.ExpandableListConnector.PositionMetadata;
/** /**
@ -515,17 +514,6 @@ public class ExpandableListView extends ListView {
if (posMetadata.position.type == ExpandableListPosition.GROUP) { if (posMetadata.position.type == ExpandableListPosition.GROUP) {
/* It's a group, so handle collapsing/expanding */ /* It's a group, so handle collapsing/expanding */
if (posMetadata.isExpanded()) {
/* Collapse it */
mConnector.collapseGroup(posMetadata);
playSoundEffect(SoundEffectConstants.CLICK);
if (mOnGroupCollapseListener != null) {
mOnGroupCollapseListener.onGroupCollapse(posMetadata.position.groupPos);
}
} else {
/* It's a group click, so pass on event */ /* It's a group click, so pass on event */
if (mOnGroupClickListener != null) { if (mOnGroupClickListener != null) {
if (mOnGroupClickListener.onGroupClick(this, v, if (mOnGroupClickListener.onGroupClick(this, v,
@ -535,6 +523,16 @@ public class ExpandableListView extends ListView {
} }
} }
if (posMetadata.isExpanded()) {
/* Collapse it */
mConnector.collapseGroup(posMetadata);
playSoundEffect(SoundEffectConstants.CLICK);
if (mOnGroupCollapseListener != null) {
mOnGroupCollapseListener.onGroupCollapse(posMetadata.position.groupPos);
}
} else {
/* Expand it */ /* Expand it */
mConnector.expandGroup(posMetadata); mConnector.expandGroup(posMetadata);