Merge change I4039545e into eclair-mr2 (d1b3988a) · Commits · e / os / android_frameworks_base

core/java/android/widget/ExpandableListView.java

+16 −18

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import android.view.ContextMenu;
		import android.view.SoundEffectConstants;
		import android.view.View;
		import android.view.ContextMenu.ContextMenuInfo;
		import android.widget.AdapterView.AdapterContextMenuInfo;
		import android.widget.ExpandableListConnector.PositionMetadata;

		/**
		@@ -515,6 +514,15 @@ public class ExpandableListView extends ListView {
		if (posMetadata.position.type == ExpandableListPosition.GROUP) {
		/* It's a group, so handle collapsing/expanding */

		/* It's a group click, so pass on event */
		if (mOnGroupClickListener != null) {
		if (mOnGroupClickListener.onGroupClick(this, v,
		posMetadata.position.groupPos, id)) {
		posMetadata.recycle();
		return true;
		}
		}

		if (posMetadata.isExpanded()) {
		/* Collapse it */
		mConnector.collapseGroup(posMetadata);
		@@ -524,17 +532,7 @@ public class ExpandableListView extends ListView {
		if (mOnGroupCollapseListener != null) {
		mOnGroupCollapseListener.onGroupCollapse(posMetadata.position.groupPos);
		}

		} else {
		/* It's a group click, so pass on event */
		if (mOnGroupClickListener != null) {
		if (mOnGroupClickListener.onGroupClick(this, v,
		posMetadata.position.groupPos, id)) {
		posMetadata.recycle();
		return true;
		}
		}

		/* Expand it */
		mConnector.expandGroup(posMetadata);