Alex Sakhartchouk
ed9f210568
Code cleanup to make formatting consistent
...
across all the renderscript files.
Change-Id: Idf5fcc60877e44c8f074f7176e37f70b3b895a3c
2010-11-10 11:30:51 -08:00
Brad Fitzpatrick
c65347f239
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
Brad Fitzpatrick
bf44ebae04
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
Scott Main
890729c88f
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
Scott Main
12a22635eb
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
Brad Fitzpatrick
9de93424cc
Merge "Without SD card the shutdown sequence was delayed"
2010-11-10 10:58:50 -08:00
Scott Main
f4724cdd0b
Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread
2010-11-10 10:46:36 -08:00
Eric Fischer
403f16ae0b
Merge changes I40bfa0f8,I9fe6a999
...
* changes:
Restore deleted string still referenced from AndroidManifest.
Import revised translations.
2010-11-10 10:26:08 -08:00
Robert Greenwalt
cec30a7a02
Merge "Fix data state change callbacks"
2010-11-10 10:12:09 -08:00
Mike Lockwood
f1094227f8
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
Mike Lockwood
83cff86dcd
MTP: Don't dump data packets twice in debug output.
...
Change-Id: I49b383d39aea101a58ae6902952ba91b44e7dc3b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-10 12:49:36 -05:00
Mike Lockwood
4a65e281fa
Add support for range and enum forms in MTP ObjectPropDescs
...
Change-Id: I70809401e37a1cfb82f5dbf86947be7d9500ccf1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-10 12:48:39 -05:00
Gil Dobjanschi
1fbeece669
Close the file input stream if the XML file parsing fails.
...
Change-Id: I254633a173d61ff8be3f2f399a2d41305076ed78
2010-11-10 09:27:13 -08:00
Brian Carlstrom
5d4c6226ca
Merge "Correctly parse cookies with spaces after = in attributes"
2010-11-10 08:52:33 -08:00
Owen Lin
5ee0c8832f
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
Owen Lin
8ffb135dc8
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
Brian Carlstrom
87ad930037
Correctly parse cookies with spaces after = in attributes
...
Bug: 3167208
Change-Id: I8adebf9f9e92967a3250e61ccfbb45e02bbee3f9
2010-11-09 22:03:17 -08:00
Jim Shuma
baa1553c8d
Fix summary for FragmentTransaction.show()
...
An apparent copy-paste left out a change that should have
been made in the method summary.
Change-Id: I158a30462fadcf617240047960e1b187b8210f6c
2010-11-09 20:37:03 -08:00
Dianne Hackborn
6c8e20f96a
Implement new task transition animations.
...
Change-Id: I62c10e7b2afac4371b3739f1cd5948c655edc125
2010-11-09 19:04:49 -08:00
Owen Lin
45ca778d8e
Merge "Make sure the controller will get repositioned after size changing." into gingerbread
2010-11-09 19:02:23 -08:00
Jim Miller
cb120a9ba7
Merge "Initial pass to update RecentApps panel to new UI specification."
2010-11-09 18:11:38 -08:00
Mathias Agopian
90d6b69426
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
Jim Miller
fefef31191
Initial pass to update RecentApps panel to new UI specification.
...
This updates recent apps to show a vertical list, complete
with thumbnails and a text description of the application.
Change-Id: I178ed8d7d32e790ac51aa7f88593aa24d6786a78
2010-11-09 17:42:49 -08:00
Jason Sams
eaf6bd1a69
Merge "Continue error check improvements and write some docs."
2010-11-09 17:38:20 -08:00
Eric Fischer
363eedcd65
Restore deleted string still referenced from AndroidManifest.
...
I think this must have been an accidental deletion since the comment
is still there.
Change-Id: I40bfa0f839efed19c073a0e9fc0b48b65d3eb293
2010-11-09 17:32:09 -08:00
Vasu Nori
3f6a1f5e59
Merge "on readonly databases, don't set journal mode and don't allow WAL"
2010-11-09 17:29:37 -08:00
Eric Fischer
6362b3f077
Import revised translations.
...
Change-Id: I9fe6a999fc665faefbf0e7e222d5dfb4fdbcd3b1
2010-11-09 17:25:54 -08:00
Mathias Agopian
0e43828799
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
Shimeng (Simon) Wang
3bf77b1fb3
Merge "Update textwrap scale when content width changes in overview mode."
2010-11-09 17:15:02 -08:00
Mathias Agopian
b48189ccfe
Merge "Improve gyro and accelerometer java doc" into gingerbread
2010-11-09 17:12:11 -08:00
Jason Sams
06d69de788
Continue error check improvements and write some docs.
...
Change-Id: I345b08490da21d9ee715ff1ddc80c1a816b579f4
2010-11-09 17:11:40 -08:00
Shimeng (Simon) Wang
dbf5ff294a
Update textwrap scale when content width changes in overview mode.
...
This is mostly for sites which will change content width when first
loaded such as nytimes.com.
Also zoom to reading level if the zoom overview scale has very
little diff from current actual scale.
issue: 3003933
Change-Id: Ie4b32bf6ac109eef145cd59b31f04077226b9052
2010-11-09 17:01:13 -08:00
Scott Main
77847a3568
docs: update eclipse guide for eclipse 3.6
...
also update system requirements
Change-Id: I5433e9e73a85b10754d3c5d4561a8acf1ca66250
2010-11-09 16:47:52 -08:00
David 'Digit' Turner
8cbb85dc46
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
Romain Guy
21c1114dad
Merge "Fix possible crash when texture is NULL in the drop shadow cache."
2010-11-09 16:41:07 -08:00
Romain Guy
f70a7e3495
Fix possible crash when texture is NULL in the drop shadow cache.
...
Change-Id: I2142c55dbcfebcdf013a7f4ae04b266a60f5ce8a
2010-11-09 16:37:28 -08:00
Robert Greenwalt
8e7e0a9fd5
Fix data state change callbacks
...
Initial state should be unknown or we miss the first connected change.
Don't send a disconnected msg when changing network types.
Filter out redundent disconnects.
Add some logging.
bug:3060742
Change-Id: Idc797c1276b7417337a91ed60b12b1bf392d57c0
2010-11-09 16:28:51 -08:00
David 'Digit' Turner
b02ca27f05
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
Fabrice Di Meglio
c184a0b9be
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
David 'Digit' Turner
b7a109c027
Merge "Refresh EGL header to work with the NDK" into gingerbread
2010-11-09 16:12:06 -08:00
Scott Main
2d5cae8cda
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
James Dong
c32474d90a
Merge "Fix missing breaks in the profile/level conversion code in M4vH263 encoder"
2010-11-09 15:48:11 -08:00
Scott Main
fe8c4f7bba
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
Scott Main
a784d5528f
Merge "docs: add release notes for ADT v8" into gingerbread
2010-11-09 15:29:22 -08:00
James Dong
0244d94455
Fix missing breaks in the profile/level conversion code in M4vH263 encoder
...
Change-Id: Icd2cac68ffb0f38acb68b2968bbb36210431482d
2010-11-09 15:15:50 -08:00
Amith Yamasani
7b6d85013b
Merge "Fix preference layouts so that custom preferences don't break."
2010-11-09 15:11:29 -08:00
Andreas Huber
40e8dc171f
Merge "Some refactoring and added support for another form of vbr headers."
2010-11-09 14:59:13 -08:00
Brad Fitzpatrick
fb55ba9807
Merge "Don't warn on reading from disk during initial class loading."
2010-11-09 14:52:15 -08:00
Andreas Huber
1bd9949815
Some refactoring and added support for another form of vbr headers.
...
related-to-bug: 3172324
Change-Id: Ic364da09eac7f0a815f9ceb719b6baa8a76e3730
2010-11-09 14:45:08 -08:00
Mathias Agopian
4c2bfc18b9
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