diff options
| author | Michael Wright <michaelwr@google.com> | 2013-07-23 20:52:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-23 20:52:57 +0000 |
| commit | b1f5585f89c49690b1263daba419a394af58cc41 (patch) | |
| tree | ca985f29362c994b38faf4495bcd0b50f61d3edf /core/jni | |
| parent | 922a8c0aa8b9ea278c6d5dc21498930dab47ea75 (diff) | |
| parent | ac6c78b6eef49f5c1ab2a346d90ccb99ccec18f4 (diff) | |
| download | frameworks_base-b1f5585f89c49690b1263daba419a394af58cc41.zip frameworks_base-b1f5585f89c49690b1263daba419a394af58cc41.tar.gz frameworks_base-b1f5585f89c49690b1263daba419a394af58cc41.tar.bz2 | |
Merge "Add controller numbers for gamepads / joysticks"
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_view_InputDevice.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/jni/android_view_InputDevice.cpp b/core/jni/android_view_InputDevice.cpp index e5e3db0..5c8e010 100644 --- a/core/jni/android_view_InputDevice.cpp +++ b/core/jni/android_view_InputDevice.cpp @@ -55,8 +55,8 @@ jobject android_view_InputDevice_create(JNIEnv* env, const InputDeviceInfo& devi ScopedLocalRef<jobject> inputDeviceObj(env, env->NewObject(gInputDeviceClassInfo.clazz, gInputDeviceClassInfo.ctor, deviceInfo.getId(), deviceInfo.getGeneration(), - nameObj.get(), descriptorObj.get(), deviceInfo.isExternal(), - deviceInfo.getSources(), deviceInfo.getKeyboardType(), + deviceInfo.getControllerNumber(), nameObj.get(), descriptorObj.get(), + deviceInfo.isExternal(), deviceInfo.getSources(), deviceInfo.getKeyboardType(), kcmObj.get(), deviceInfo.hasVibrator(), deviceInfo.hasButtonUnderPad())); const Vector<InputDeviceInfo::MotionRange>& ranges = deviceInfo.getMotionRanges(); @@ -86,8 +86,9 @@ int register_android_view_InputDevice(JNIEnv* env) FIND_CLASS(gInputDeviceClassInfo.clazz, "android/view/InputDevice"); gInputDeviceClassInfo.clazz = jclass(env->NewGlobalRef(gInputDeviceClassInfo.clazz)); - GET_METHOD_ID(gInputDeviceClassInfo.ctor, gInputDeviceClassInfo.clazz, "<init>", - "(IILjava/lang/String;Ljava/lang/String;ZIILandroid/view/KeyCharacterMap;ZZ)V"); + GET_METHOD_ID(gInputDeviceClassInfo.ctor, gInputDeviceClassInfo.clazz, + "<init>", + "(IIILjava/lang/String;Ljava/lang/String;ZIILandroid/view/KeyCharacterMap;ZZ)V"); GET_METHOD_ID(gInputDeviceClassInfo.addMotionRange, gInputDeviceClassInfo.clazz, "addMotionRange", "(IIFFFFF)V"); |