mirror of
https://github.com/apache/cordova-android.git
synced 2025-02-01 01:53:00 +08:00
Merged Joe`s turning off of native geolocation in WebView.
This commit is contained in:
commit
020178e40b
@ -38,6 +38,6 @@
|
|||||||
<action android:name="android.intent.action.PICK" />
|
<action android:name="android.intent.action.PICK" />
|
||||||
</activity>
|
</activity>
|
||||||
</application>
|
</application>
|
||||||
<uses-sdk android:minSdkVersion="3" />
|
<uses-sdk android:minSdkVersion="2" />
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
|
@ -109,10 +109,8 @@ public class DroidGap extends Activity {
|
|||||||
|
|
||||||
// Turn on DOM storage!
|
// Turn on DOM storage!
|
||||||
WebViewReflect.setDomStorage(settings);
|
WebViewReflect.setDomStorage(settings);
|
||||||
|
|
||||||
// Turn off native geolocation object in browser - we use our own :)
|
// Turn off native geolocation object in browser - we use our own :)
|
||||||
WebViewReflect.setGeolocationEnabled(settings, false);
|
WebViewReflect.setGeolocationEnabled(settings, false);
|
||||||
|
|
||||||
/* Bind the appView object to the gap class methods */
|
/* Bind the appView object to the gap class methods */
|
||||||
bindBrowser(appView);
|
bindBrowser(appView);
|
||||||
if(cupcakeStorage != null)
|
if(cupcakeStorage != null)
|
||||||
|
@ -1,69 +0,0 @@
|
|||||||
package com.phonegap;
|
|
||||||
/* License (MIT)
|
|
||||||
* Copyright (c) 2008 Nitobi
|
|
||||||
* website: http://phonegap.com
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining
|
|
||||||
* a copy of this software and associated documentation files (the
|
|
||||||
* “Software”), to deal in the Software without restriction, including
|
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
||||||
* permit persons to whom the Software is furnished to do so, subject to
|
|
||||||
* the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be
|
|
||||||
* included in all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
|
||||||
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
||||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
||||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.hardware.SensorManager;
|
|
||||||
import android.hardware.SensorListener;
|
|
||||||
import android.webkit.WebView;
|
|
||||||
|
|
||||||
public class Orientation implements SensorListener{
|
|
||||||
|
|
||||||
private WebView mAppView;
|
|
||||||
private SensorManager sensorManager;
|
|
||||||
private Context mCtx;
|
|
||||||
|
|
||||||
Orientation(WebView kit, Context ctx) {
|
|
||||||
mAppView = kit;
|
|
||||||
mCtx = ctx;
|
|
||||||
sensorManager = (SensorManager) mCtx.getSystemService(Context.SENSOR_SERVICE);
|
|
||||||
this.resumeAccel();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onSensorChanged(int sensor, final float[] values) {
|
|
||||||
if (sensor != SensorManager.SENSOR_ACCELEROMETER || values.length < 3)
|
|
||||||
return;
|
|
||||||
float x = values[0];
|
|
||||||
float y = values[1];
|
|
||||||
float z = values[2];
|
|
||||||
mAppView.loadUrl("javascript:gotAcceleration(" + x + ", " + y + "," + z + ")");
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onAccuracyChanged(int arg0, int arg1) {
|
|
||||||
// This is a stub method.
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public void pauseAccel()
|
|
||||||
{
|
|
||||||
sensorManager.unregisterListener(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void resumeAccel()
|
|
||||||
{
|
|
||||||
sensorManager.registerListener(this,
|
|
||||||
SensorManager.SENSOR_ACCELEROMETER,
|
|
||||||
SensorManager.SENSOR_DELAY_GAME);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -75,7 +75,6 @@ public class WebViewReflect {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/* feature not supported, do something else */
|
/* feature not supported, do something else */
|
||||||
System.out.println("Database not supported");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public static void setGeolocationEnabled(WebSettings setting, boolean enable) {
|
public static void setGeolocationEnabled(WebSettings setting, boolean enable) {
|
||||||
@ -117,9 +116,7 @@ public class WebViewReflect {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/* feature not supported, do something else */
|
/* feature not supported, do something else */
|
||||||
System.out.println("DOM Storage not supported");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user