Merge branch 'master' into highlighter

This commit is contained in:
vita10gy
2013-04-28 13:59:26 -05:00
32 changed files with 10401 additions and 503 deletions

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cradle.iitc_mobile"
android:versionCode="11"
android:versionName="0.3" >
android:versionCode="12"
android:versionName="0.3.1" >
<uses-sdk
android:minSdkVersion="14"

View File

@ -18,11 +18,12 @@ public class IITC_JSInterface {
context = c;
}
// send intent for gmaps link
// send geo intent for navigation apps like gmaps or waze etc...
@JavascriptInterface
public void intentPosLink(String s) {
public void intentPosLink(String lat, String lng, String portal_name) {
String uri = "geo:" + lat + "," + lng + "?q=" + lat + "," + lng + portal_name;
Intent intent = new Intent(android.content.Intent.ACTION_VIEW,
Uri.parse(s));
Uri.parse(uri));
context.startActivity(intent);
}

View File

@ -22,6 +22,7 @@ public class IITC_WebView extends WebView {
settings.setDomStorageEnabled(true);
settings.setAllowFileAccess(true);
settings.setGeolocationEnabled(true);
settings.setDatabasePath(this.getContext().getApplicationInfo().dataDir + "/databases/");
this.js_interface = new IITC_JSInterface(c);
this.addJavascriptInterface(js_interface, "android");