device_api-android 1.2.16 → 1.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a60d874192e707106199039e8d1163d7ef5a9ca0
-  data.tar.gz: 66017f7dbf4e46e8ea407c6a7c0b7d0f2dc2eed7
+  metadata.gz: c33f2b423b46f2379ff4d39c9361433f594a42d7
+  data.tar.gz: 8a339deec28540ad5e7828090355391e1fe55b65
 SHA512:
-  metadata.gz: d990e5a3d73eb9e27e77302ca8a98e172b4f04f2ee352f93fd78abd17ace2ee6818eab4768014a635c7919b3ac0a0ff70a9aca24dac3f2d0310e3586634ebca8
-  data.tar.gz: e205e6b2789fd07565e0bb0765d207afbce0a76a8d473c28c0a45ef31a42bfd1dce3dbc5f7f5f9a2d2d4457cb2c900d397d077c06499a1ab53afdc6859434734
+  metadata.gz: 8c98f250479b2d6655abe94adf2f26a9007a818d6cc3caf841134fdb56b196e1d4cd6e8166c4f2e0401fa74d79fcfbd14d6baafc74d65fba1834fec5ed78d51c
+  data.tar.gz: 0fac819f51ff456635282145e24a92ef271793a2a4f55f6897e1749b392f6aed3ceaac01666f71a049b541359fc0dda1ea6404850e55534baea30fb2f8d926ca

data/lib/device_api/android/device.rb

@@ -325,6 +325,11 @@ module DeviceAPI
         end
       end
 
+      def resolution
+       res = ADB.dumpsys(qualifier, 'window | grep mUnrestrictedScreen')
+       /^.* (.*)x(.*)$/.match(res.first)
+      end
+
       private
 
       def get_network_info

data/lib/device_api/android/device/kindle.rb

@@ -7,17 +7,20 @@ module DeviceAPI
       # work due to Amazons implementation of the Keyguard.
       def unlock
         ADB.keyevent(qualifier, '26') unless screen_on?
+        ADB.swipe(qualifier, swipe_coords)
+      end
 
-        return ADB.swipe(qualifier, {x_from: 900, y_from: 500, x_to: 300, y_to: 500}) if version.split('.').first.to_i < 5
-
-        if orientation == :landscape
-          coords = { x_from: 500, y_from: 750, x_to: 500, y_to: 250 }
+      def swipe_coords
+        res = resolution
+        x = res[1].to_i
+        y = res[2].to_i
+        if version.split('.').first.to_i < 5
+          {x_from: x - 100, y_from: y/2, x_to: x/6, y_to: y/2}
         else
-          coords = { x_from: 300, y_from: 900, x_to: 300, y_to: 600 }
+          { x_from: x/2, y_from: y -100, x_to: x/2, y_to: y/6}
         end
-
-        ADB.swipe(qualifier, coords)
       end
+
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: device_api-android
 version: !ruby/object:Gem::Version
-  version: 1.2.16
+  version: 1.2.17
 platform: ruby
 authors:
 - David Buckhurst
@@ -11,62 +11,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: device_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.12'
 - !ruby/object:Gem::Dependency
   name: android-devices
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Android implementation of DeviceAPI
@@ -76,17 +76,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/device_api/android.rb
 - lib/device_api/android/aapt.rb
 - lib/device_api/android/adb.rb
-- lib/device_api/android/device.rb
 - lib/device_api/android/device/kindle.rb
 - lib/device_api/android/device/samsung.rb
+- lib/device_api/android/device.rb
 - lib/device_api/android/plugins/audio.rb
 - lib/device_api/android/plugins/battery.rb
 - lib/device_api/android/plugins/disk.rb
 - lib/device_api/android/plugins/memory.rb
 - lib/device_api/android/signing.rb
+- lib/device_api/android.rb
 homepage: https://github.com/bbc/device_api-android
 licenses:
 - MIT
@@ -97,17 +97,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Android Device Management API