Kenny Root 0a9b54e88b resolved conflicts for merge of 8bb7a1df to master ...

Change-Id: Ieec036f494a54eab74a27b954d1423bf981dd3f9

2010-10-13 15:43:51 -07:00

..

asset_manager_jni.h

More native work.

2010-08-11 00:29:59 -07:00

asset_manager.h

More native work.

2010-08-11 00:29:59 -07:00

bitmap.h

…

configuration.h

Fix night/notnight resource folder handling.

2010-09-30 11:26:02 +02:00

input.h

Input API review.

2010-09-14 20:46:14 -07:00

keycodes.h

Add initial gamepad support.

2010-07-13 17:04:57 -07:00

looper.h

Switch Looper back to using poll() instead of epoll().

2010-10-07 13:26:39 -07:00

native_activity.h

More native work.

2010-08-11 00:29:59 -07:00

native_window_jni.h

Add ANativeWindow API for directly drawing to the surface bits.

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

native_window.h

More native work.

2010-08-11 00:29:59 -07:00

obb.h

Update OBB API to include callbacks

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

rect.h

Add ANativeWindow API for directly drawing to the surface bits.

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

sensor.h

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

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

storage_manager.h

OBB: rearrange to be entirely asynchronous

2010-10-11 17:22:03 -07:00

tts.h

Adding the old legacy method for getTtsEngine for Froyo compatibility.

2010-07-14 15:21:56 -07:00

window.h

Add ANativeWindow API for directly drawing to the surface bits.

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