Merge "libui: Add support for the Xperia Play jogdials" into gingerbread (1d4860a9) · Commits · e / os / android_frameworks_base

libs/ui/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,8 @@ else ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),vision)
		LOCAL_CFLAGS += -DVISION_KEYPAD
		else ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),speedy)
		LOCAL_CFLAGS += -DVISION_KEYPAD
		else ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),zeus)
		LOCAL_CFLAGS += -DZEUS_TOUCHPADS
		endif

		ifeq ($(BOARD_NO_RGBX_8888),true)

+12 −0

Original line number	Diff line number	Diff line
		@@ -342,7 +342,19 @@ InputDevice* InputReader::createDevice(int32_t deviceId, const String8& name, ui

		// Touchscreen-like devices.
		if (classes & INPUT_DEVICE_CLASS_TOUCHSCREEN_MT) {
		#ifdef ZEUS_TOUCHPADS
		/* According to the Sony Ericsson SDK, the jogdials should be interpreted
		* as an AINPUT_SOURCE_TOUCHPAD. According to getSources() above, a
		* touchpad is simply a device with a negative associated display id.
		*/
		if (deviceId == 0x10004) {
		device->addMapper(new MultiTouchInputMapper(device, -1));
		} else {
		device->addMapper(new MultiTouchInputMapper(device, associatedDisplayId));
		}
		#else
		device->addMapper(new MultiTouchInputMapper(device, associatedDisplayId));
		#endif
		} else if (classes & INPUT_DEVICE_CLASS_TOUCHSCREEN) {
		device->addMapper(new SingleTouchInputMapper(device, associatedDisplayId));
		}