Dianne Hackborn aa9d84c37e resolved conflicts for merge of 05be6d6f to master ...

Change-Id: Ic6a6c5bb300f6f1d43f9ed550b284282b4f16212

2011-05-09 19:00:59 -07:00

..

egl

frameworks/base: move ANativeWindow/android_native_buffer_t out

2011-05-03 16:39:54 -07:00

android_native_buffer.h

frameworks/base: move ANativeWindow/android_native_buffer_t out

2011-05-03 16:39:54 -07:00

DisplayInfo.h

Mouse pointer integration.

2011-01-04 17:31:24 -08:00

EGLNativeSurface.h

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

EGLUtils.h

added EGLUtils::strerror

2009-08-07 16:37:21 -07:00

FramebufferNativeWindow.h

frameworks/base: android_native_buffer_t -> ANativeWindowBuffer

2011-05-03 16:40:14 -07:00

GraphicBuffer.h

frameworks/base: android_native_buffer_t -> ANativeWindowBuffer

2011-05-03 16:40:14 -07:00

GraphicBufferAllocator.h

[3171580] don't automatically log GraphicBuffer allocation failures

2010-12-03 17:33:09 -08:00

GraphicBufferMapper.h

fix [2167050] glTexImage2D code path buggy in SurfaceFlinger

2009-10-06 17:00:25 -07:00

GraphicLog.h

fix a typo where the eventtags code were wrong

2010-09-15 12:46:59 -07:00

Input.h

resolved conflicts for merge of 05be6d6f to master

2011-05-09 19:00:59 -07:00

InputTransport.h

Add support for fallback keycodes.

2010-12-07 17:35:26 -08:00

Keyboard.h

Fade out the mouse pointer after inactivity or other events.

2011-03-02 15:37:57 -08:00

KeyCharacterMap.h

Add support for fallback keycodes.

2010-12-07 17:35:26 -08:00

KeycodeLabels.h

Add 3D mode key and others.

2011-03-16 11:31:42 -07:00

KeyLayoutMap.h

Joystick tweaks. (DO NOT MERGE)

2011-03-04 19:12:41 -08:00

PixelFormat.h

fix a bug I introduced recently where YUV formats would crash the system

2010-02-16 20:43:39 -08:00

Point.h

minor clean-up to Rect and Point.

2009-05-26 17:47:39 -07:00

PowerManager.h

The CHEEK_TOUCH stuff never worked. Remove it.

2010-11-08 13:02:58 -08:00

Rect.h

Add ANativeWindow API for directly drawing to the surface bits.

2010-07-09 16:58:19 -07:00

Region.h

get rid of dependency on copybit HAL module

2011-04-28 19:50:21 -07:00

VirtualKeyMap.h

Improve support for external keyboards.

2010-12-02 16:01:32 -08:00