Commit Graph

17381 Commits

Author SHA1 Message Date
Dianne Hackborn
bb356a2721 Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread 2010-11-10 17:58:28 -08:00
Jeff Brown
82a517475a Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread 2010-11-10 16:00:37 -08:00
Scott Main
ee6ceed44a resolved conflicts for merge of 5a726729 to gingerbread
Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15
2010-11-10 14:46:44 -08:00
Mathias Agopian
70745094cc Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread 2010-11-10 14:09:17 -08:00
Scott Main
cfc1ecf6da Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread 2010-11-10 10:46:36 -08:00
Owen Lin
409a974bdd Merge "Make sure the controller will get repositioned after size changing." into gingerbread 2010-11-09 19:02:23 -08:00
Mathias Agopian
4bf9ccb84b Merge "Improve gyro and accelerometer java doc" into gingerbread 2010-11-09 17:12:11 -08:00
David 'Digit' Turner
3aa9fe0526 Merge "Refresh EGL header to work with the NDK" into gingerbread 2010-11-09 16:12:06 -08:00
Scott Main
24a6729a25 Merge "docs: add release notes for ADT v8" into gingerbread 2010-11-09 15:29:22 -08:00
Mathias Agopian
744026fed6 DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions
We just make sure eglGetProcAddress() will return NULL for
 glEGLImageTargetTexture2DOES
 glEGLImageTargetRenderbufferStorageOES

which is better than returning the address of the wrong implementation.

the correct fix is more involved.

Change-Id: I585a1f40e564f862e5dd382224609ccd069cd3b5
2010-11-09 14:41:13 -08:00
Scott Main
2fcbe03d87 Merge "docs: revisions to ndk release notes" into gingerbread 2010-11-09 09:30:30 -08:00
Jeff Hamilton
b2973f20e8 Merge "Reduce log clutter." into gingerbread 2010-11-09 06:54:51 -08:00
James Dong
b9e1c44fa9 Merge "Update a comment about when setOrientationHint() should be called" into gingerbread 2010-11-08 19:59:16 -08:00
Mathias Agopian
820a5aa233 Merge "improve sensorservice dumpsys and increase the max sensor rate to 1 ms (1000Hz)" into gingerbread 2010-11-08 18:28:32 -08:00
Adam Powell
6a93f33840 Merge "DO NOT MERGE Fix bug 3121030 - Text handles erroneously appear over extract mode IME window" into gingerbread 2010-11-08 18:14:01 -08:00
James Dong
cf87ec3e6e Merge "Support extracting thumbnail from rotated video tracks" into gingerbread 2010-11-08 18:00:14 -08:00
Andy McFadden
41c29357ad am c10a4773: Set capabilities sooner.
* commit 'c10a4773ece6ca66ba9cfe4cd15e5987a02bee68':
  Set capabilities sooner.
2010-11-08 17:58:50 -08:00
Justin Ho
4fa59225c5 Merge "DO NOT MERGE - Updated textfield pressed states" into gingerbread 2010-11-08 17:49:57 -08:00
Scott Main
c344054897 Merge "docs: remove quick start; make it an overview of the steps and go to installing guide" into gingerbread 2010-11-08 16:05:24 -08:00
Mathias Agopian
dcdcc115d2 Merge "possibly fix [2265804] OpenGL GLSurfaceView apps don't draw status bar drop shadow correctly" into gingerbread 2010-11-08 13:41:31 -08:00
Mathias Agopian
a2b1b7f71d Merge "fix [3148312] Region can access data out of bounds" into gingerbread 2010-11-08 13:40:40 -08:00
David 'Digit' Turner
dfd0759ff6 Refresh EGL header to work with the NDK
This change allows to use this header with the NDK's standalone toolchain.
For the record, the NDK toolchain defines __ANDROID__ as a compiler built-in
macro, this is however not the case currently for the prebuilt binaries that
are being used by the full Android build system, which otherwise defines ANDROID.

This change allows the header to be used by all toolchains properly. Note however
that we should properly should change our toolchain and sources to provide and
rely on __ANDROID__ instead of ANDROID though.

Change-Id: Iaa1aa1146985b5f24dcf3a83d9ddb9b4b59dc328
2010-11-07 23:36:28 +01:00
James Dong
dca7b6fbd0 Merge "Rotation support" into gingerbread 2010-11-05 16:58:51 -07:00
James Dong
29bdd6749b Merge "Add a new public API to support recording rotated videos" into gingerbread 2010-11-05 16:58:33 -07:00
Scott Main
56cf5dfa73 Merge "docs: update homepage for GB" into gingerbread 2010-11-05 15:02:39 -07:00
Hiroshi Lockheimer
b307b2386b Merge "allow all 4 orientations" into gingerbread 2010-11-05 05:21:00 +00:00
Scott Main
b9539d6dd0 Merge "Doc change: Updating and restructuring the NDK section for GB. Filenames for new NDK packages still need updating." into gingerbread 2010-11-04 19:27:50 -07:00
Scott Main
c08b653546 Merge "fix xlarge support in aapt for gingerbread" into gingerbread 2010-11-04 18:56:47 -07:00
Dan Bornstein
a8aaf181b1 am 05cc2d63: (-s ours) This class no longer exists.
* commit '05cc2d635eba165098a8ff58678a2ef1db5ddd1a':
  This class no longer exists.
2010-11-04 16:30:06 -07:00
Eric Rowe
860417a853 Merge "DO NOT MERGE Add acceptPair method to BT stress." into gingerbread 2010-11-04 14:54:23 -07:00
Scott Main
07581f4ffd Merge "docs: more revisions to the installing docs for GB" into gingerbread 2010-11-04 09:17:54 -07:00
James Dong
fde60b39f9 Merge "Revert "Support rotation in media recorder"" into gingerbread 2010-11-03 19:42:17 -07:00
Scott Main
07a722fd22 Merge "docs: some more edits to the sdk install docs" into gingerbread 2010-11-03 18:03:01 -07:00
Mathias Agopian
61ee1a86df Merge "[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread 2010-11-03 17:57:32 -07:00
Hiroshi Lockheimer
2c08def60c Merge "Support rotation in media recorder" into gingerbread 2010-11-03 17:57:28 -07:00
Gilles Debunne
7b9085d53b Merge "ldpi assets created from hdpi in core." into gingerbread 2010-11-03 17:37:28 -07:00
Hiroshi Lockheimer
e51cdee3eb Merge "Squash ANRs in UsbStorageActivity." into gingerbread 2010-11-03 17:08:03 -07:00
Alexander Lucas
211a28eaae Merge "Added SIP Demo" into gingerbread 2010-11-03 15:32:57 -07:00
Justin Ho
87933f223c Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread 2010-11-03 13:39:26 -07:00
Jeff Hamilton
8de195a531 Merge "Remove the My Tag feature." into gingerbread 2010-11-03 13:34:39 -07:00
Daniel Sandler
9fd94b9d10 Merge "Fix the fix for storage ANRs." into gingerbread 2010-11-03 12:36:31 -07:00
James Dong
15d9a6ddd8 Merge "DO NOT MERGE" into gingerbread 2010-11-03 09:21:44 -07:00
Daniel Sandler
49affef924 Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread 2010-11-02 20:34:10 -07:00
Jason parks
e58a1272a8 Merge "Return a zero length byte from toByteArray instead of null." into gingerbread 2010-11-02 18:58:09 -07:00
Dirk Dougherty
3f28855222 am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
* commit '36a1bcee76d35636b4050674eb98285c3a3a6c2f':
  Doc change: Update uses-feature and permissions docs.
2010-11-02 17:43:54 -07:00
Dirk Dougherty
5eb239555c Merge "Doc change: Update uses-feature and permissions docs." into froyo 2010-11-02 17:40:27 -07:00
Nick Pelly
967c143f91 Merge "Remove timeout support." into gingerbread 2010-11-02 14:46:46 -07:00
Joe Malin
65b842595d Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread 2010-11-02 13:17:16 -07:00
Raphael
1dfaaa7368 Merge "Support for <compatible-screens><screen> in ADT." into gingerbread 2010-11-02 11:43:11 -07:00
Gilles Debunne
b14d942ae5 Merge "Rescaled/updated mdpi assets added." into gingerbread 2010-11-02 10:05:52 -07:00