am 2584e685: Merge "bug:3510826 longpress, then shortpress behave differenctly in ExpandedListView" into honeycomb-mr1

* commit '2584e68522a22c81901d0512835e49359c69c021':
  bug:3510826 longpress, then shortpress behave differenctly in ExpandedListView

1 files changed, 10 insertions, 2 deletions

diff --git a/ui/src/com/android/providers/downloads/ui/DownloadList.java b/ui/src/com/android/providers/downloads/ui/DownloadList.java
index c6bd219b..810e93e6 100644
--- a/ui/src/com/android/providers/downloads/ui/DownloadList.java
+++ b/ui/src/com/android/providers/downloads/ui/DownloadList.java
@@ -233,8 +233,16 @@ public class DownloadList extends Activity {
             @Override
             public boolean onChildClick(ExpandableListView parent, View v,
                     int groupPosition, int childPosition, long id) {
-                mDateSortedAdapter.moveCursorToChildPosition(groupPosition, childPosition);
-                handleItemClick(mDateSortedCursor);
+                if (!(v instanceof DownloadItem)) {
+                    // can this even happen?
+                    return false;
+                }
+                if (mSelectedIds.size() > 0) {
+                    ((DownloadItem)v).setChecked(true);
+                } else {
+                    mDateSortedAdapter.moveCursorToChildPosition(groupPosition, childPosition);
+                    handleItemClick(mDateSortedCursor);
+                }
                 return true;
             }
         });