Fixed CCScrollView pan gesture recognizer bug (regression).

Author: osinoleg

cocos2d-ui/CCScrollView.m

@@ -751,7 +751,6 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecogni
     return (otherGestureRecognizer == _panRecognizer || otherGestureRecognizer == _tapRecognizer);
 }
 
-#elif __CC_PLATFORM_ANDROID
 
 - (void) onEnterTransitionDidFinish
 {
@@ -776,11 +775,9 @@ - (void) onEnterTransitionDidFinish
     [super onEnterTransitionDidFinish];
 }
 
-
-
 - (void) onExitTransitionDidStart
 {
-#if __CC_PLATFORM_IOS
+
     // Remove recognizers from view
     UIView* view = [CCDirector sharedDirector].view;
 
@@ -789,20 +786,35 @@ - (void) onExitTransitionDidStart
     [recognizers removeObject:_tapRecognizer];
 
     view.gestureRecognizers = recognizers;
+
+    [super onExitTransitionDidStart];
+}
+
 #elif __CC_PLATFORM_ANDROID
+
+- (void) onEnterTransitionDidFinish
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if(_detector)
+        {
+            [[[CCDirector sharedDirector] view] addGestureDetector:_detector];
+        }
+    });
+    [super onEnterTransitionDidFinish];
+}
+
+- (void) onExitTransitionDidStart
+{
     dispatch_async(dispatch_get_main_queue(), ^{
         if(_detector)
         {
             [[[CCDirector sharedDirector] view] removeGestureDetector:_detector];
         }
     });
-#endif
 
     [super onExitTransitionDidStart];
 }
 
-
-
 - (CCTouchPhase)handleGestureEvent:(AndroidMotionEvent *)start end:(AndroidMotionEvent *)end
 {
     CCTouchPhase phase = CCTouchPhaseStationary;