Merge remote-tracking branch 'upstream/master'

Conflicts:
	sample-code/examples/ruby/cucumber_ios/features/support/appium.txt

Author: Sathish Gogineni

.gitignore

@@ -34,3 +34,27 @@ build/
 .rvmrc
 
 *.xcuserdatad
+
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Intellij
+.idea/
+*.iml
+*.iws
+
+# Mac
+.DS_Store
+
+# Maven
+log/
+target/
+
+# npm
+node_modules
+
+# Python
+__pycache__
+*.pyc

package.json

@@ -0,0 +1,23 @@
+{
+  "name": "appium-sample-code",
+  "version": "1.0.0",
+  "description": "Code examples for Appium",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/appium/sample-code.git"
+  },
+  "keywords": [
+    "appium",
+    "testcode"
+  ],
+  "author": "appium",
+  "license": "apache-2.0",
+  "bugs": {
+    "url": "https://github.com/appium/sample-code/issues"
+  },
+  "homepage": "https://github.com/appium/sample-code"
+}

sample-code/apps/ApiDemos/bin/ApiDemos-debug.apk

@@ -57,7 +57,7 @@ - (void)viewDidLoad
     secondArg.returnKeyType = UIReturnKeyDone;
     firstArg.delegate = self;
     secondArg.delegate = self;
-    [NSTimer scheduledTimerWithTimeInterval:0.1
+    [NSTimer scheduledTimerWithTimeInterval:0.2
                                      target:self
                                    selector:@selector(logLocationAuthFromTimer:)
                                    userInfo:nil
@@ -69,9 +69,20 @@ - (void)viewDidLoad
     [answerLabel setAccessibilityIdentifier:@"Answer"];
     [locationStatus setAccessibilityIdentifier:@"locationStatus"];
 
+    UISwipeGestureRecognizer * swipe =[[UISwipeGestureRecognizer alloc]initWithTarget:self action:@selector(swipeUp:)];
+    swipe.direction = UISwipeGestureRecognizerDirectionUp;
+    [self.view addGestureRecognizer:swipe];
+    [swipe release];
+
     computeSumButton.titleLabel.text = NSLocalizedString(@"main.button.computeSum", @"Compute Sum button");
 }
 
+-(void)swipeUp:(UISwipeGestureRecognizer*)gestureRecognizer
+{
+    [secondArg resignFirstResponder];
+}
+
+
 - (void)logLocationAuthFromTimer:(NSTimer *)timer
 {
     [self logLocationAuth];
@@ -80,7 +91,7 @@ - (void)logLocationAuthFromTimer:(NSTimer *)timer
 - (void)logLocationAuth
 {
     CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
-    if (status == kCLAuthorizationStatusAuthorized) {
+    if (status != kCLAuthorizationStatusRestricted && status != kCLAuthorizationStatusDenied) {
         locationStatus.on = YES;
     } else {
         locationStatus.on = NO;
@@ -170,7 +181,7 @@ - (IBAction)accessContactsAlert:(id)sender {
 
 - (IBAction)accessLocationAlert:(id)sender {
     CLLocationManager *locationManager = [[CLLocationManager alloc] init];
-    
+
     [locationManager startUpdatingLocation];
     [locationManager stopUpdatingLocation];
 }

sample-code/apps/TestApp/Test App 2/MyViewControllerViewController.m

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <deployment defaultVersion="1552" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MyViewControllerViewController">
@@ -114,19 +113,6 @@
                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A test label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="c5c-gA-adh">
-                    <rect key="frame" x="82" y="439" width="86" height="21"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <accessibility key="accessibilityConfiguration" label="">
-                        <bool key="isElement" value="NO"/>
-                    </accessibility>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="string" keyPath="accessibilityIdentifier" value="Access'ibility"/>
-                    </userDefinedRuntimeAttributes>
-                </label>
                 <switch opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="bMw-Gn-PAX">
                     <rect key="frame" x="170" y="378" width="51" height="31"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -163,9 +149,27 @@
                         <action selector="crashApp:" destination="-1" eventType="touchUpInside" id="YRC-14-Xer"/>
                     </connections>
                 </button>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="test" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="c5c-gA-adh">
+                    <rect key="frame" x="234" y="291" width="29" height="21"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <accessibility key="accessibilityConfiguration" label="">
+                        <bool key="isElement" value="NO"/>
+                    </accessibility>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <nil key="highlightedColor"/>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="string" keyPath="accessibilityIdentifier" value="Access'ibility"/>
+                    </userDefinedRuntimeAttributes>
+                </label>
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-            <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
         </view>
     </objects>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4"/>
+    </simulatedMetricsContainer>
 </document>