summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/NavTabGallery.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/browser/NavTabGallery.java')
-rw-r--r--src/com/android/browser/NavTabGallery.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/browser/NavTabGallery.java b/src/com/android/browser/NavTabGallery.java
index 8247a5d..af02e8d 100644
--- a/src/com/android/browser/NavTabGallery.java
+++ b/src/com/android/browser/NavTabGallery.java
@@ -127,7 +127,7 @@ public class NavTabGallery extends Gallery {
}
private void animateOut(final View v, float velocity) {
- if (mAnimator != null) return;
+ if ((v == null) || (mAnimator != null)) return;
final int position = mFirstPosition + indexOfChild(v);
int target = 0;
if (velocity < 0) {
@@ -151,7 +151,7 @@ public class NavTabGallery extends Gallery {
setGapPosition(position, mHorizontal ? v.getWidth() : v.getHeight());
}
mRemoveListener.onRemovePosition(position);
- if (!needsGap && position > 0) {
+ if (!needsGap && (position > 0) && (mAdapter.getCount() > 0)) {
scrollToChild(position - 1);
}
mAnimator = null;