Merge branch 'headless-develop' of github.com:spritebuilder/cocos2d-swift into headless-develop

Author: osinoleg

cocos2d-tests-android/Headless/tests/CCTextFieldTest.m

@@ -34,7 +34,7 @@ - (void) setupTextFieldBasicTest
     textField.preferredSize = CGSizeMake(0.5, 50);
     textField.positionType = CCPositionTypeNormalized;
     textField.position = ccp(0.5f, 0.8f);
-    textField.padding = 6;
+    textField.padding = 10;
     textField.anchorPoint = ccp(0.5f, 0.5f);
     textField.string = @"Hello!";
 

cocos2d-ui/Platform/Android/CCPlatformTextFieldAndroid.m

@@ -14,7 +14,7 @@
 #import "CCDirector.h"
 #import "CCEditText.h"
 
- 
+
 @implementation CCPlatformTextFieldAndroid {
     CCEditText *_editText;
 }
@@ -50,29 +50,28 @@ - (void) onExitTransitionDidStart
 - (void) positionInControl:(CCControl *)control padding:(float)padding {
     CGPoint worldPos = [control convertToWorldSpace:CGPointZero];
     CGPoint viewPos = [[CCDirector sharedDirector] convertToUI:worldPos];
-    viewPos.x += padding;
-//    viewPos.y += padding;
+    
 
     CGFloat scale = [[CCDirector sharedDirector] contentScaleFactor];
 
     viewPos.x *= scale;
     viewPos.y *= scale;
 
     CGSize size = control.contentSizeInPoints;
-    size.width -= padding * 2;
-    size.height -= padding * 2;
     size.width *= scale;
     size.height *= scale ;
-    viewPos.y -= size.height + padding *scale;
-
+    viewPos.y -=  size.height;
+    
 
     CGRect frame = CGRectZero;
     frame.origin = viewPos;
     frame.size = size;
+    int nativePadding = (int)padding*scale;
     dispatch_async(dispatch_get_main_queue(), ^{
         AndroidViewGroupLayoutParams *oldParams = [_editText layoutParams];
         AndroidRelativeLayoutLayoutParams *params = [[AndroidRelativeLayoutLayoutParams alloc] initWithWidth:frame.size.width height:frame.size.height];
         [params setMargins:frame.origin.x top:frame.origin.y right:0 bottom:0];
+        [_editText setPadding:nativePadding top:nativePadding right:nativePadding bottom:nativePadding];
         [_editText setLayoutParams:params];
         [_editText setImeOptions:AndroidEditorInfoIME_FLAG_NO_EXTRACT_UI];
 
@@ -82,7 +81,7 @@ - (void) positionInControl:(CCControl *)control padding:(float)padding {
             if ([[weakSelf delegate] respondsToSelector:@selector(platformTextFieldDidFinishEditing:)]) {
                 [[weakSelf delegate] platformTextFieldDidFinishEditing:weakSelf];
             }
-
+            
         }];
     });
 }
@@ -106,12 +105,12 @@ - (void)setFontSize:(float)fontSize {
     dispatch_async(dispatch_get_main_queue(), ^{
         // AndroidDisplayMetrics *metrics = [[AndroidDisplayMetrics alloc] init];
         // [[CCActivity currentActivity].windowManager.defaultDisplay getMetrics:metrics];
-
+        
         [_editText setTextSizeDouble:fontSize];
-
+        
     });
-
-
+    
+    
 }
 
 - (void)setString:(NSString *)string {

cocos2d/CCConfiguration.m

@@ -146,13 +146,34 @@ -(NSInteger) runningDevice
 	NSInteger ret=-1;
 
 #if __CC_PLATFORM_ANDROID
-    if([CCDirector sharedDirector].contentScaleFactor > 1.0)
-    {
-        ret = CCDeviceiPhoneRetinaDisplay;
-    }
-    else
-    {
-        ret = CCDeviceiPhone;
+   
+    
+    AndroidDisplayMetrics *metrics = [[AndroidDisplayMetrics alloc] init];
+    [[CCActivity currentActivity].windowManager.defaultDisplay getMetrics:metrics];
+    double yInches= metrics.heightPixels/metrics.ydpi;
+    double xInches= metrics.widthPixels/metrics.xdpi;
+    double diagonalInches = sqrt(xInches*xInches + yInches*yInches);
+    if (diagonalInches<=6){
+        
+        
+        if([CCDirector sharedDirector].contentScaleFactor > 1.0)
+        {
+            ret = CCDeviceiPhoneRetinaDisplay;
+        }
+        else
+        {
+            ret = CCDeviceiPhone;
+        }
+    } else {
+        if([CCDirector sharedDirector].contentScaleFactor > 1.0)
+        {
+            ret = CCDeviceiPadRetinaDisplay;
+        }
+        else
+        {
+            ret = CCDeviceiPad;
+        }
+        
     }
 #elif __CC_PLATFORM_IOS
 

external/ObjectAL/OALSimpleAudio.m

@@ -659,31 +659,11 @@ - (void) unloadAllEffects
 		return nil;
 	}
 
-#if 0 // __CC_PLATFORM_ANDROID
-    // TODO: we are creating a player and throwing it away each time, and not taking into account if it was preloaded.
-    // think about checking for preload and implement the player's asyncPrepare finish listener
-    AndroidAssetFileDescriptor *assetFd = [[[CCActivity currentActivity] assets] openFdWithFileName:filePath];
-    
-    if (assetFd.fileDescriptor && [assetFd.fileDescriptor valid]) {
-        AndroidMediaPlayer *player = [[AndroidMediaPlayer alloc] init];
-        [player reset];
-        [player setDataSource:assetFd.fileDescriptor offset:assetFd.startOffset length:assetFd.length];
-#warning TODO: note sure how to set on finished listener for player and call the player's release() (not objc release) in the callback to close fd
-        [player prepare];
-        [player start];
-    }
-    
-    if (assetFd) {
-        [assetFd close];
-    }
-    // TODO: convert to ALSoundSource and return
-#else
 	ALBuffer* buffer = [self internalPreloadEffect:filePath reduceToMono:NO];
 	if(nil != buffer)
 	{
 		return [channel play:buffer gain:volume pitch:pitch pan:pan loop:loop];
 	}
-#endif
 	return nil;
 }