Merge "Minor clean-up in DeviceOrientation and DeviceMotion"

Author: Steve Block

core/java/android/webkit/DeviceMotionAndOrientationManager.java

@@ -22,22 +22,21 @@
  *
  * 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) {
         mWebViewCore = webViewCore;
     }
 
     /**
-     * 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 @@ public void onOrientationChange(Double alpha, Double beta, Double gamma) {
     }
 
     // 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);

core/java/android/webkit/DeviceMotionService.java

@@ -153,6 +153,7 @@ private void unregisterFromSensor() {
      * 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 @@ public void onSensorChanged(SensorEvent event) {
         }
     }
 
+    @Override
     public void onAccuracyChanged(Sensor sensor, int accuracy) {
         assert WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName());
     }

core/java/android/webkit/DeviceOrientationService.java

@@ -184,6 +184,7 @@ private void maybeSendChange(double alpha, double beta, double gamma) {
      * 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 @@ public void onSensorChanged(SensorEvent event) {
         }
     }
 
+    @Override
     public void onAccuracyChanged(Sensor sensor, int accuracy) {
         assert WebViewCore.THREAD_NAME.equals(Thread.currentThread().getName());
     }

core/java/android/webkit/WebViewClassic.java

@@ -5049,8 +5049,8 @@ public void dumpRenderTree(boolean toFile) {
      *
      * debug only
      */
-    public void useMockDeviceOrientation() {
-        mWebViewCore.sendMessage(EventHub.USE_MOCK_DEVICE_ORIENTATION);
+    public void setUseMockDeviceOrientation() {
+        mWebViewCore.sendMessage(EventHub.SET_USE_MOCK_DEVICE_ORIENTATION);
     }
 
     /**

core/java/android/webkit/WebViewCore.java

@@ -1138,7 +1138,7 @@ public class EventHub implements WebViewInputDispatcher.WebKitCallbacks {
         // 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 @@ public void handleMessage(Message msg) {
                                     .sendToTarget();
                             break;
 
-                        case USE_MOCK_DEVICE_ORIENTATION:
-                            useMockDeviceOrientation();
+                        case SET_USE_MOCK_DEVICE_ORIENTATION:
+                            setUseMockDeviceOrientation();
                             break;
 
                         case AUTOFILL_FORM:
@@ -2993,8 +2993,8 @@ private void selectAt(int x, int y) {
         // 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,

tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java

@@ -168,7 +168,7 @@ protected void onCreate(Bundle icicle) {
         }
 
         // This is asynchronous, but it gets processed by WebCore before it starts loading pages.
-        mWebViewClassic.useMockDeviceOrientation();
+        mWebViewClassic.setUseMockDeviceOrientation();
     }
 
     @Override

tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java

@@ -394,7 +394,7 @@ private void setupWebView(WebView webView) {
         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();