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

Fix ExpandableListView context menus when has header views.

Browse Source 
createContextMenuInfo() should have been subtracting any
header views, similar to performItemClick().  Previously,
this caused getUnflattenedPos() to return invalid positions.

This fixes http://b/issue?id=1778239
This commit is contained in:
Jeff Sharkey
2009-08-17 00:52:46 -07:00
parent 7d68dae99f
commit fd0d627569
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@ 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;
/** /**
@@ -916,7 +917,14 @@ public class ExpandableListView extends ListView {
@Override @Override
ContextMenuInfo createContextMenuInfo(View view, int flatListPosition, long id) { ContextMenuInfo createContextMenuInfo(View view, int flatListPosition, long id) {
PositionMetadata pm = mConnector.getUnflattenedPos(flatListPosition); // Adjust for and handle for header views
final int adjustedPosition = flatListPosition - getHeaderViewsCount();
if (adjustedPosition < 0) {
// Return normal info for header view context menus
return new AdapterContextMenuInfo(view, flatListPosition, id);
}
PositionMetadata pm = mConnector.getUnflattenedPos(adjustedPosition);
ExpandableListPosition pos = pm.position; ExpandableListPosition pos = pm.position;
pm.recycle(); pm.recycle();