summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Venkatesh Shukla <venkatesh.shukla.eee11@iitbhu.ac.in>2015-08-21 00:19:46 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-08-20 23:01:15 -0700
commiteb31b3b0759caf74708d5792d211c1f393c509e0 (patch)
tree0c2e382bb9a4c58f22c64ae727323ffca7498d48
parent8d73e4f81c384c36e5ed3b8848253fd1e0b70692 (diff)
downloadsubsurface-eb31b3b0759caf74708d5792d211c1f393c509e0.tar.gz
Open subsurface on attaching divecomputer
Added USB usage permissions in manifest. Also added various FTDI based USB devices in xml/device_filter.xml. When any device matching the VID and PID provided in the device_filter.xml is attached, subsurface application is opened automatically. Also, the USB permissions are granted to the application. This simplifies the USB file generation approach. Signed-off-by: Venkatesh Shukla <venkatesh.shukla.eee11@iitbhu.ac.in> Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--android/AndroidManifest.xml10
-rw-r--r--android/res/xml/device_filter.xml14
2 files changed, 23 insertions, 1 deletions
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 882623781..c9a016a0c 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -81,6 +81,12 @@
<meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/>
-->
<!-- Splash screen -->
+ <intent-filter>
+ <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
+ </intent-filter>
+
+ <meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
+ android:resource="@xml/device_filter" />
</activity>
</application>
@@ -91,7 +97,9 @@
android:anyDensity="true"
android:largeScreens="true"
android:normalScreens="true"
- android:smallScreens="true" />
+ android:smallScreens="true" />
+
+ <uses-feature android:name="android.hardware.usb.host" />
<!--
The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
diff --git a/android/res/xml/device_filter.xml b/android/res/xml/device_filter.xml
new file mode 100644
index 000000000..fc9333bdb
--- /dev/null
+++ b/android/res/xml/device_filter.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <!-- FTDI Chips -->
+ <!-- (Smart Interface), Heinrichs Weikamp -->
+ <usb-device vendor-id="1027" product-id="24577"/>
+ <usb-device vendor-id="1027" product-id="24592"/>
+ <usb-device vendor-id="1027" product-id="24593"/>
+ <!-- Oceanic Custom PID -->
+ <usb-device vendor-id="1027" product-id="62560"/>
+ <!-- Suunto Custom PID -->
+ <usb-device vendor-id="1027" product-id="63104"/>
+ <!-- Cressi (Leonardo) Custom PID -->
+ <usb-device vendor-id="1027" product-id="63104"/>
+</resources>