Media queries: excluded non-pointing devices from pointer/hover

ui/android/java/src/org/chromium/ui/base/TouchDevice.java

Index: ui/android/java/src/org/chromium/ui/base/TouchDevice.java
diff --git a/ui/android/java/src/org/chromium/ui/base/TouchDevice.java b/ui/android/java/src/org/chromium/ui/base/TouchDevice.java
index 38edf900d88a94c61cd1b1edf1fafb550f842950..889edf467ac5f7ca612e68a8c109516442375d3a 100644
--- a/ui/android/java/src/org/chromium/ui/base/TouchDevice.java
+++ b/ui/android/java/src/org/chromium/ui/base/TouchDevice.java
@@ -66,14 +66,14 @@ public class TouchDevice {
                 pointerTypesVal |= PointerType.FINE;
             } else if (hasSource(sources, InputDevice.SOURCE_TOUCHSCREEN)) {
                 pointerTypesVal |= PointerType.COARSE;
-            } else {
-                // The remaining InputDevice sources:
-                // SOURCE_DPAD, SOURCE_GAMEPAD, SOURCE_JOYSTICK, SOURCE_KEYBOARD,
-                // SOURCE_TOUCH_NAVIGATION, SOURCE_UNKNOWN
-                pointerTypesVal |= PointerType.NONE;
             }
+            // Remaining InputDevice sources: SOURCE_DPAD, SOURCE_GAMEPAD, SOURCE_JOYSTICK,
+            // SOURCE_KEYBOARD, SOURCE_TOUCH_NAVIGATION, SOURCE_UNKNOWN
         }
 
+        if (pointerTypesVal == 0)
+            pointerTypesVal = PointerType.NONE;
+
         return pointerTypesVal;
     }
 
@@ -94,14 +94,14 @@ public class TouchDevice {
             } else if (hasSource(sources, InputDevice.SOURCE_STYLUS)
                     || hasSource(sources, InputDevice.SOURCE_TOUCHSCREEN)) {
                 hoverTypesVal |= HoverType.ON_DEMAND;
-            } else {
-                // The remaining InputDevice sources:
-                // SOURCE_DPAD, SOURCE_GAMEPAD, SOURCE_JOYSTICK,
-                // SOURCE_KEYBOARD, SOURCE_TOUCH_NAVIGATION, SOURCE_UNKNOWN
-                hoverTypesVal |= HoverType.NONE;
             }
+            // Remaining InputDevice sources: SOURCE_DPAD, SOURCE_GAMEPAD, SOURCE_JOYSTICK,
+            // SOURCE_KEYBOARD, SOURCE_TOUCH_NAVIGATION, SOURCE_UNKNOWN
         }
 
+        if (hoverTypesVal == 0)
+            hoverTypesVal = HoverType.NONE;
+
         return hoverTypesVal;
     }