54cc83e8a4
Implement reducing the buffer count of a Surface.
...
Change-Id: I7f979c60c06d654aa8265002836277434bc1a64f
Bug: 3095167
2010-11-11 14:06:38 -08:00
e9ebae24b9
Fix a compile warning in the Surface class.
...
Change-Id: Id744e71d2cd23c287925a5090e13a6d9908cdd99
2010-11-11 13:41:43 -08:00
5d9a8d6ecb
am d4b5d85e: (-s ours) am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread
...
* commit 'd4b5d85e2cbf8fb7150a0b0030132e28d7e4d9e2':
docs: remove "new" tags from sample apps
2010-11-10 15:10:13 -08:00
7e358cb73c
Merge "Move ApplicationPackageManager out of ContextImpl.java"
2010-11-10 15:07:28 -08:00
fb673c8b81
Merge "Move SharedPreferencesImpl out of ContextImpl.java"
2010-11-10 15:07:15 -08:00
50fa3a8d73
Merge "Add description and configuration methods to the transport interface"
2010-11-10 15:00:48 -08:00
bbea7710b7
am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread
...
* commit '77f5c9542e159cb9f2f2908227212d4add8ce74c':
docs: remove "new" tags from sample apps
2010-11-10 14:55:48 -08:00
ee6ceed44a
resolved conflicts for merge of 5a726729 to gingerbread
...
Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15
2010-11-10 14:46:44 -08:00
fdeadb99f4
Merge "Close the file input stream if the XML file parsing fails."
2010-11-10 14:43:19 -08:00
6bdad0357d
am d6c7893d: (-s ours) am 17fd21fc: Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread
...
* commit 'd6c7893d663aa74840bb491ddbce500bc0752ac5':
DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions
2010-11-10 14:20:26 -08:00
339c9c3c75
Merge "Fix uninitialized variable"
2010-11-10 14:18:26 -08:00
a8422af09e
am 17fd21fc: Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread
...
* commit '17fd21fc0638d8734867b6f189efbabb227f3ae1':
DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions
2010-11-10 14:15:57 -08:00
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
7fc79fe297
Merge "Code cleanup to make formatting consistent across all the renderscript files."
2010-11-10 12:16:50 -08:00
6ad4459d7d
Merge "Fix bug 3183378 - make theme attribute selectableItemBackground public."
2010-11-10 12:11:47 -08:00
c2d82ba1a5
Merge "Move all debug flags in a single place."
2010-11-10 12:04:05 -08:00
0c248032cd
am bf44ebae: am 9de93424: Merge "Without SD card the shutdown sequence was delayed"
...
* commit 'bf44ebae04f837596b9942ccb15d3d47bad4acec':
Without SD card the shutdown sequence was delayed
2010-11-10 11:11:40 -08:00
3c978c6f67
am 9de93424: Merge "Without SD card the shutdown sequence was delayed"
...
* commit '9de93424cc05446e3a216f406c55a3937c028416':
Without SD card the shutdown sequence was delayed
2010-11-10 11:07:18 -08:00
a27eba8ff9
am 12a22635: am f4724cdd: Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread
...
* commit '12a22635ebfcdf9f5dff7081740da680c9b689ae':
docs: update eclipse guide for eclipse 3.6 also update system requirements
2010-11-10 11:05:39 -08:00
badf9397e3
am f4724cdd: Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread
...
* commit 'f4724cdd0b39eddb14a686ecaec05ff44258a7f7':
docs: update eclipse guide for eclipse 3.6 also update system requirements
2010-11-10 10:59:45 -08:00
dfa88ec75b
Merge "Without SD card the shutdown sequence was delayed"
2010-11-10 10:58:50 -08:00
cfc1ecf6da
Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread
2010-11-10 10:46:36 -08:00
3873d6e2cd
Merge changes I40bfa0f8,I9fe6a999
...
* changes:
Restore deleted string still referenced from AndroidManifest.
Import revised translations.
2010-11-10 10:26:08 -08:00
e8d83500b6
Merge "Fix data state change callbacks"
2010-11-10 10:12:09 -08:00
09be538033
Merge changes I49b383d3,I70809401
...
* changes:
MTP: Don't dump data packets twice in debug output.
Add support for range and enum forms in MTP ObjectPropDescs
2010-11-10 09:57:34 -08:00
6c95b7983f
Merge "Correctly parse cookies with spaces after = in attributes"
2010-11-10 08:52:33 -08:00
61039d77d8
am 8ffb135d: am 45ca778d: Merge "Make sure the controller will get repositioned after size changing." into gingerbread
...
* commit '8ffb135dc892c09f1781231f783b0890515b3d60':
Make sure the controller will get repositioned after size changing.
2010-11-10 08:37:51 -08:00
110d8738e5
am 45ca778d: Merge "Make sure the controller will get repositioned after size changing." into gingerbread
...
* commit '45ca778d8ed90aff3f72fc85f806cedbd4121cc1':
Make sure the controller will get repositioned after size changing.
2010-11-10 08:25:02 -08:00
409a974bdd
Merge "Make sure the controller will get repositioned after size changing." into gingerbread
2010-11-09 19:02:23 -08:00
bf0b893331
Merge "Initial pass to update RecentApps panel to new UI specification."
2010-11-09 18:11:38 -08:00
be2be90106
am 0e438287: am b48189cc: Merge "Improve gyro and accelerometer java doc" into gingerbread
...
* commit '0e438287995698aacdda715713300fc01a6d1585':
Improve gyro and accelerometer java doc
2010-11-09 17:43:16 -08:00
23b9bd6674
Merge "Continue error check improvements and write some docs."
2010-11-09 17:38:20 -08:00
dc19a9b88b
Merge "on readonly databases, don't set journal mode and don't allow WAL"
2010-11-09 17:29:37 -08:00
ddb17b3221
am b48189cc: Merge "Improve gyro and accelerometer java doc" into gingerbread
...
* commit 'b48189ccfe42a408fb713565e54e165d255c6d66':
Improve gyro and accelerometer java doc
2010-11-09 17:24:57 -08:00
6bdea053b1
Merge "Update textwrap scale when content width changes in overview mode."
2010-11-09 17:15:02 -08:00
4bf9ccb84b
Merge "Improve gyro and accelerometer java doc" into gingerbread
2010-11-09 17:12:11 -08:00
ab5426e53d
am b02ca27f: am b7a109c0: Merge "Refresh EGL header to work with the NDK" into gingerbread
...
* commit 'b02ca27f05a47fad75c57d6d8c52ccc5b21a8043':
Refresh EGL header to work with the NDK
2010-11-09 16:42:27 -08:00
f859e66087
Merge "Fix possible crash when texture is NULL in the drop shadow cache."
2010-11-09 16:41:07 -08:00
2346d0223f
am b7a109c0: Merge "Refresh EGL header to work with the NDK" into gingerbread
...
* commit 'b7a109c02735bb0d9e0bcb8f84e4aa3923701460':
Refresh EGL header to work with the NDK
2010-11-09 16:25:58 -08:00
5ea9b966d8
Merge "Fix bug #1776278 (consider supplying our own (unique) eid for calendar entries created on the device)"
2010-11-09 16:13:22 -08:00
3aa9fe0526
Merge "Refresh EGL header to work with the NDK" into gingerbread
2010-11-09 16:12:06 -08:00
2e46be44d7
am fe8c4f7b: am a784d552: Merge "docs: add release notes for ADT v8" into gingerbread
...
* commit 'fe8c4f7bbad87fc387b8d8b79f5343055a1a1039':
docs: add release notes for ADT v8
2010-11-09 15:58:24 -08:00
e1f3b46715
Merge "Fix missing breaks in the profile/level conversion code in M4vH263 encoder"
2010-11-09 15:48:11 -08:00
fcc532c11b
am a784d552: Merge "docs: add release notes for ADT v8" into gingerbread
...
* commit 'a784d5528f6fa07a48bb7de9dcfa04eb60044927':
docs: add release notes for ADT v8
2010-11-09 15:34:46 -08:00
24a6729a25
Merge "docs: add release notes for ADT v8" into gingerbread
2010-11-09 15:29:22 -08:00
5261199c6e
Merge "Fix preference layouts so that custom preferences don't break."
2010-11-09 15:11:29 -08:00
792f3a75c9
Merge "Some refactoring and added support for another form of vbr headers."
2010-11-09 14:59:13 -08:00
7ca663369c
Merge "Don't warn on reading from disk during initial class loading."
2010-11-09 14:52:15 -08:00
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
083f0fa400
Merge "Fix fountain bug with more than 10 touches reported."
2010-11-09 14:23:06 -08:00
Jamie Gennis