Merge "Don't assume there's a selected position in touch mode. Bug #2520743" into froyo

2010-03-26 17:30:40 -07:00
parent a947fce312 91c8613679
commit 213b9805e3
1 changed files with 4 additions and 2 deletions
--- a/core/java/android/widget/GridView.java
+++ b/core/java/android/widget/GridView.java
@@ -1128,11 +1128,13 @@ public class GridView extends AbsListView {
            default:
                if (childCount == 0) {
                    if (!mStackFromBottom) {
-                        setSelectedPositionInt(0);
+                        setSelectedPositionInt(mAdapter == null || isInTouchMode() ?
+                                INVALID_POSITION : 0);
                        sel = fillFromTop(childrenTop);
                    } else {
                        final int last = mItemCount - 1;
-                        setSelectedPositionInt(last);
+                        setSelectedPositionInt(mAdapter == null || isInTouchMode() ?
+                                INVALID_POSITION : last);
                        sel = fillFromBottom(last, childrenBottom);
                    }
                } else {