Enabled CCSliders for Android. Fixed a bug that was causing touches to get cancelled because android gesture detectors were not being removed.

Author: osinoleg

cocos2d-ui/CCScrollView.m

@@ -214,7 +214,6 @@ - (id) initWithContentNode:(CCNode*)contentNode
         _listener = [[CCGestureListener alloc] init];
         _listener.delegate = (id<CCGestureListenerDelegate>)self;
         _detector = [[AndroidGestureDetector alloc] initWithContext:[CCActivity currentActivity] listener:_listener];
-        [[[CCDirector sharedDirector] view] addGestureDetector:_detector];
     });
 #elif __CC_PLATFORM_MAC
 
@@ -752,8 +751,11 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecogni
     return (otherGestureRecognizer == _panRecognizer || otherGestureRecognizer == _tapRecognizer);
 }
 
+#elif __CC_PLATFORM_ANDROID
+
 - (void) onEnterTransitionDidFinish
 {
+#if __CC_PLATFORM_IOS
     // Add recognizers to view
     UIView* view = [CCDirector sharedDirector].view;
 
@@ -763,12 +765,22 @@ - (void) onEnterTransitionDidFinish
     [recognizers insertObject:_tapRecognizer atIndex:0];
 
     view.gestureRecognizers = recognizers;
-    
+#elif __CC_PLATFORM_ANDROID
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if(_detector)
+        {
+            [[[CCDirector sharedDirector] view] addGestureDetector:_detector];
+        }
+    });
+#endif
     [super onEnterTransitionDidFinish];
 }
 
+
+
 - (void) onExitTransitionDidStart
 {
+#if __CC_PLATFORM_IOS
     // Remove recognizers from view
     UIView* view = [CCDirector sharedDirector].view;
 
@@ -777,11 +789,19 @@ - (void) onExitTransitionDidStart
     [recognizers removeObject:_tapRecognizer];
 
     view.gestureRecognizers = recognizers;
+#elif __CC_PLATFORM_ANDROID
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if(_detector)
+        {
+            [[[CCDirector sharedDirector] view] removeGestureDetector:_detector];
+        }
+    });
+#endif
 
     [super onExitTransitionDidStart];
 }
 
-#elif __CC_PLATFORM_ANDROID
+
 
 - (CCTouchPhase)handleGestureEvent:(AndroidMotionEvent *)start end:(AndroidMotionEvent *)end
 {
@@ -930,9 +950,6 @@ - (BOOL)onFling:(AndroidMotionEvent *)start end:(AndroidMotionEvent *)end veloci
     CCDirector* dir = [CCDirector sharedDirector];
     [[CCActivity currentActivity] runOnGameThread:^{
 
-        CCResponderManager *mgr = [[CCDirector sharedDirector] responderManager];
-        [mgr removeAllResponders];
-
         CGPoint translation = [dir convertToGL:rawTranslationFling];
         translation = [self convertToNodeSpace:translation];
 

cocos2d-ui/CCSlider.m

@@ -71,7 +71,7 @@ - (void) updateSliderPositionFromValue
     _handle.position = ccp(size.width * _sliderValue, size.height/2.0f);
 }
 
-#if __CC_PLATFORM_IOS
+#if __CC_PLATFORM_IOS || __CC_PLATFORM_ANDROID
 
 #pragma mark Handle touches
 

cocos2d/Platforms/Android/CCGLView.m

@@ -101,7 +101,9 @@ - (BOOL)onTouchEvent:(AndroidMotionEvent *)event
         }
 
         if(cancelTouch)
+        {
             phase = CCTouchPhaseCancelled;
+        }
 
         NSTimeInterval timestamp = event.eventTime * 1000.0;
         currentEvent.timestamp = timestamp;