OSDN Git Service

fix bug 2200625 - NPE at com.android.launcher2.AllAppsView.onTouchEvent(AllAppsView...
authorJoe Onorato <joeo@android.com>
Wed, 28 Oct 2009 19:17:01 +0000 (15:17 -0400)
committerJoe Onorato <joeo@android.com>
Wed, 28 Oct 2009 19:17:01 +0000 (15:17 -0400)
There's no need to do selection if we're not visible.

src/com/android/launcher2/AllAppsView.java

index 2dd3b4d..f5fdd36 100644 (file)
@@ -192,6 +192,11 @@ public class AllAppsView extends RSSurfaceView
     @Override
     protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) {
         super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
+
+        if (!isVisible()) {
+            return;
+        }
+
         if (gainFocus) {
             if (!mArrowNavigation && mRollo.mState.iconCount > 0) {
                 // Select the first icon when we gain keyboard focus
@@ -212,6 +217,10 @@ public class AllAppsView extends RSSurfaceView
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
 
+        if (!isVisible()) {
+            return false;
+        }
+
         if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) {
             if (mArrowNavigation) {
                 int whichApp = mRollo.mState.selectedIconIndex;