Dianne Hackborn 8a7d44e824 resolved conflicts for merge of 54cb63e2 to master ...

Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10

2011-06-02 16:44:52 -07:00

..

asset_manager_jni.h

…

asset_manager.h

Introduce NDK API for 64-bit assets

2010-12-13 12:02:19 -08:00

bitmap.h

…

configuration.h

Add "tv" density for 720p screens.

2011-05-27 13:40:26 -07:00

input.h

Add initial API for stylus and mouse buttons.

2011-05-13 12:11:17 -07:00

keycodes.h

Add 3D mode key and others.

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

looper.h

Fade out the mouse pointer after inactivity or other events.

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

native_activity.h

Add API to get path to OBBs.

2011-01-16 18:43:04 -08:00

native_window_jni.h

Bug 3515073 Add ANativeWindow_fromSurfaceTexture

2011-03-04 16:39:29 -08:00

native_window.h

ANativeWindow_setBuffersGeometry now returns proper error codes

2011-03-31 20:59:58 -07:00

obb.h

Update OBB API to include callbacks

2010-09-28 17:23:26 -07:00

rect.h

…

sensor.h

Replace epoll() with poll() and rename PollLoop to Looper.

2010-09-14 01:59:45 -07:00

storage_manager.h

OBB: Change documentation to reflect reality

2010-10-13 12:37:18 -07:00

window.h

…