Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(656)

Unified Diff: ui/base/touch/touch_device_android.cc

Issue 696713002: Pointer/hover media query support: platform-dependent changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/touch/touch_device.cc ('k') | ui/base/touch/touch_device_aurax11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/touch/touch_device_android.cc
diff --git a/ui/base/touch/touch_device_android.cc b/ui/base/touch/touch_device_android.cc
index 604306c8bb38ff71a6072db2e6514cfa36fef31e..fc5d3ac54e638c2a695f5c7c1bb844503a8f1005 100644
--- a/ui/base/touch/touch_device_android.cc
+++ b/ui/base/touch/touch_device_android.cc
@@ -4,6 +4,7 @@
#include "ui/base/touch/touch_device.h"
+#include "base/logging.h"
#include "jni/TouchDevice_jni.h"
namespace ui {
@@ -19,6 +20,42 @@ int MaxTouchPoints() {
return static_cast<int>(max_touch_points);
}
+int GetAvailablePointerTypes() {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ jobject context = base::android::GetApplicationContext();
+ jint available_pointer_types =
+ Java_TouchDevice_availablePointerTypes(env, context);
+ return static_cast<int>(available_pointer_types);
+}
+
+PointerType GetPrimaryPointerType() {
+ int available_pointer_types = GetAvailablePointerTypes();
+ if (available_pointer_types & POINTER_TYPE_COARSE)
+ return POINTER_TYPE_COARSE;
+ if (available_pointer_types & POINTER_TYPE_FINE)
+ return POINTER_TYPE_FINE;
+ DCHECK(available_pointer_types & POINTER_TYPE_NONE);
+ return POINTER_TYPE_NONE;
+}
+
+int GetAvailableHoverTypes() {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ jobject context = base::android::GetApplicationContext();
+ jint available_hover_types =
+ Java_TouchDevice_availableHoverTypes(env, context);
+ return static_cast<int>(available_hover_types);
+}
+
+HoverType GetPrimaryHoverType() {
+ int available_hover_types = GetAvailableHoverTypes();
+ if (available_hover_types & HOVER_TYPE_ON_DEMAND)
+ return HOVER_TYPE_ON_DEMAND;
+ if (available_hover_types & HOVER_TYPE_HOVER)
+ return HOVER_TYPE_HOVER;
+ DCHECK(available_hover_types & HOVER_TYPE_NONE);
+ return HOVER_TYPE_NONE;
+}
+
bool RegisterTouchDeviceAndroid(JNIEnv* env) {
return RegisterNativesImpl(env);
}
« no previous file with comments | « ui/base/touch/touch_device.cc ('k') | ui/base/touch/touch_device_aurax11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698