Merge "Minor clean-up in DeviceOrientation and DeviceMotion"
diff --git a/core/java/android/webkit/DeviceMotionAndOrientationManager.java b/core/java/android/webkit/DeviceMotionAndOrientationManager.java
index 79b78d8..ea1e9ff 100644
--- a/core/java/android/webkit/DeviceMotionAndOrientationManager.java
+++ b/core/java/android/webkit/DeviceMotionAndOrientationManager.java
@@ -22,9 +22,8 @@
*
* This could be part of WebViewCore, but have moved it to its own class to
* avoid bloat there.
- * @hide
*/
-public final class DeviceMotionAndOrientationManager {
+final class DeviceMotionAndOrientationManager {
private WebViewCore mWebViewCore;
public DeviceMotionAndOrientationManager(WebViewCore webViewCore) {
@@ -32,12 +31,12 @@
}
/**
- * Sets whether the Page for this WebViewCore should use a mock DeviceOrientation
+ * Sets that the Page for this WebViewCore should use a mock DeviceOrientation
* client.
*/
- public void useMock() {
+ public void setUseMock() {
assert WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName());
- nativeUseMock(mWebViewCore);
+ nativeSetUseMock(mWebViewCore);
}
/**
@@ -66,7 +65,7 @@
}
// Native functions
- private static native void nativeUseMock(WebViewCore webViewCore);
+ private static native void nativeSetUseMock(WebViewCore webViewCore);
private static native void nativeSetMockOrientation(WebViewCore webViewCore,
boolean canProvideAlpha, double alpha, boolean canProvideBeta, double beta,
boolean canProvideGamma, double gamma);
diff --git a/core/java/android/webkit/DeviceMotionService.java b/core/java/android/webkit/DeviceMotionService.java
index b4d5759..9121429 100755
--- a/core/java/android/webkit/DeviceMotionService.java
+++ b/core/java/android/webkit/DeviceMotionService.java
@@ -153,6 +153,7 @@
* SensorEventListener implementation.
* Callbacks happen on the thread on which we registered - the WebCore thread.
*/
+ @Override
public void onSensorChanged(SensorEvent event) {
assert(event.values.length == 3);
assert WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName());
@@ -170,6 +171,7 @@
}
}
+ @Override
public void onAccuracyChanged(Sensor sensor, int accuracy) {
assert WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName());
}
diff --git a/core/java/android/webkit/DeviceOrientationService.java b/core/java/android/webkit/DeviceOrientationService.java
index 47c8ab7..2e8656c 100755
--- a/core/java/android/webkit/DeviceOrientationService.java
+++ b/core/java/android/webkit/DeviceOrientationService.java
@@ -184,6 +184,7 @@
* SensorEventListener implementation.
* Callbacks happen on the thread on which we registered - the WebCore thread.
*/
+ @Override
public void onSensorChanged(SensorEvent event) {
assert(event.values.length == 3);
assert WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName());
@@ -217,6 +218,7 @@
}
}
+ @Override
public void onAccuracyChanged(Sensor sensor, int accuracy) {
assert WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName());
}
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 5dc2681..9895a87 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -5049,8 +5049,8 @@
*
* debug only
*/
- public void useMockDeviceOrientation() {
- mWebViewCore.sendMessage(EventHub.USE_MOCK_DEVICE_ORIENTATION);
+ public void setUseMockDeviceOrientation() {
+ mWebViewCore.sendMessage(EventHub.SET_USE_MOCK_DEVICE_ORIENTATION);
}
/**
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index dd05e8c..15a2d48 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -1138,7 +1138,7 @@
// accessibility support
static final int MODIFY_SELECTION = 190;
- static final int USE_MOCK_DEVICE_ORIENTATION = 191;
+ static final int SET_USE_MOCK_DEVICE_ORIENTATION = 191;
static final int AUTOFILL_FORM = 192;
@@ -1650,8 +1650,8 @@
.sendToTarget();
break;
- case USE_MOCK_DEVICE_ORIENTATION:
- useMockDeviceOrientation();
+ case SET_USE_MOCK_DEVICE_ORIENTATION:
+ setUseMockDeviceOrientation();
break;
case AUTOFILL_FORM:
@@ -2993,8 +2993,8 @@
// TODO: Figure out what to do with this (b/6111818)
}
- private void useMockDeviceOrientation() {
- mDeviceMotionAndOrientationManager.useMock();
+ private void setUseMockDeviceOrientation() {
+ mDeviceMotionAndOrientationManager.setUseMock();
}
public void setMockDeviceOrientation(boolean canProvideAlpha, double alpha,
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
index d151d9e..77c0a3f 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
@@ -168,7 +168,7 @@
}
// This is asynchronous, but it gets processed by WebCore before it starts loading pages.
- mWebViewClassic.useMockDeviceOrientation();
+ mWebViewClassic.setUseMockDeviceOrientation();
}
@Override
diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java
index fc22472..f958ade 100644
--- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java
+++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java
@@ -394,7 +394,7 @@
webViewSettings.setPageCacheCapacity(0);
// This is asynchronous, but it gets processed by WebCore before it starts loading pages.
- WebViewClassic.fromWebView(mCurrentWebView).useMockDeviceOrientation();
+ WebViewClassic.fromWebView(mCurrentWebView).setUseMockDeviceOrientation();
// Must do this after setting the AppCache path.
WebStorage.getInstance().deleteAllData();