26416 Commits

Author SHA1 Message Date
Ben Murdoch
31a4dbf5ca Fix NPE in the webruntime after the splash screen has been dismissed.
Change-Id: I91a01cf34f54ef07d4f175a3e5cd3b40086a6f07
2010-07-08 12:26:50 +01:00
Dan Tasse
768d98e5f3 am 7017e0d5: am f3f25bf8: Added some javadoc to Camera.takePicture()
Merge commit '7017e0d5c372db1e470d9881c46b15eade051d76'

* commit '7017e0d5c372db1e470d9881c46b15eade051d76':
  Added some javadoc to Camera.takePicture()
2010-07-07 20:55:47 -07:00
Eric Laurent
98449546fa am b91881fd: am dacabf97: Merge "Added Visualizer effect." into gingerbread
Merge commit 'b91881fdd1608cc922f105ec552b5505da1fecb9'

* commit 'b91881fdd1608cc922f105ec552b5505da1fecb9':
  Added Visualizer effect.
2010-07-07 20:55:40 -07:00
Xia Wang
f3bfd84101 am 98738272: Merge "Remove voice mail number verification for testing on no-sim device" into gingerbread
Merge commit '98738272e3b680559e1e0a7b665a0ebb4038f684' into gingerbread-plus-aosp

* commit '98738272e3b680559e1e0a7b665a0ebb4038f684':
  Remove voice mail number verification for testing on no-sim device
2010-07-07 19:05:48 -07:00
Xia Wang
98738272e3 Merge "Remove voice mail number verification for testing on no-sim device" into gingerbread 2010-07-07 19:04:03 -07:00
Jason Sams
9c959e77f1 Merge "Fix image processing resource problem for non high-density devices. Protect include file." 2010-07-07 18:52:21 -07:00
Jason Sams
f26d01a7ce Merge "Add boolean support for setVar." 2010-07-07 18:52:03 -07:00
Fabrice Di Meglio
07b236edce Merge "Fix bug #2779582 (Columns cleanup for the Calendars table)" 2010-07-07 18:46:10 -07:00
Scott Main
717b517ab3 am 1082ae03: am 5183ae3b: Merge "docs: add caution about adt in eclipse 3.6" into froyo
Merge commit '1082ae033dbe7d278b3fef6e4fd9af149d360fc1' into gingerbread-plus-aosp

* commit '1082ae033dbe7d278b3fef6e4fd9af149d360fc1':
  docs: add caution about adt in eclipse 3.6
2010-07-07 18:45:14 -07:00
Xia Wang
374fe5c446 Remove voice mail number verification for testing on no-sim device
Change-Id: Iaf9e419b8d03e330864d64c05aee730d33994003
2010-07-07 18:43:17 -07:00
Scott Main
1082ae033d am 5183ae3b: Merge "docs: add caution about adt in eclipse 3.6" into froyo
Merge commit '5183ae3b0f27dfff5ecdceabaa4950eef38b31e8' into gingerbread

* commit '5183ae3b0f27dfff5ecdceabaa4950eef38b31e8':
  docs: add caution about adt in eclipse 3.6
2010-07-07 18:43:10 -07:00
Scott Main
5183ae3b0f Merge "docs: add caution about adt in eclipse 3.6" into froyo 2010-07-07 18:37:48 -07:00
Kenny Root
0a21801f5f am a5402dab: Merge "OBB API for PackageManager" into gingerbread
Merge commit 'a5402dabec84eabcdb9008dc343dd67de325bbac' into gingerbread-plus-aosp

* commit 'a5402dabec84eabcdb9008dc343dd67de325bbac':
  OBB API for PackageManager
2010-07-07 18:16:05 -07:00
Kenny Root
d481cdd4c0 am c9535de8: Merge "Add OBB file helper class" into gingerbread
Merge commit 'c9535de8e398d766c95144f9a831f34b2cecfd91' into gingerbread-plus-aosp

* commit 'c9535de8e398d766c95144f9a831f34b2cecfd91':
  Add OBB file helper class
2010-07-07 18:16:01 -07:00
Kenny Root
a5402dabec Merge "OBB API for PackageManager" into gingerbread 2010-07-07 18:14:25 -07:00
Kenny Root
c9535de8e3 Merge "Add OBB file helper class" into gingerbread 2010-07-07 18:14:13 -07:00
Romain Guy
132f22590a Merge "Add support to draw 9patches in OpenGL." 2010-07-07 17:57:12 -07:00
Romain Guy
deba785f12 Add support to draw 9patches in OpenGL.
This change only adds the necessary API and stubs. The implementation
will be added in another change.

Change-Id: Ie50b8aff5868e78796cee331df15bdbf990d2ea1
2010-07-07 17:55:03 -07:00
Chris Tate
167449e5f8 am b17f4dcf: Merge "More native input dispatch work." into gingerbread
Merge commit 'b17f4dcfb3edba25bd8c30e60449b9bbcd600a57' into gingerbread-plus-aosp

* commit 'b17f4dcfb3edba25bd8c30e60449b9bbcd600a57':
  More native input dispatch work.
2010-07-07 17:45:21 -07:00
Chris Tate
b17f4dcfb3 Merge "More native input dispatch work." into gingerbread 2010-07-07 17:43:12 -07:00
Brett Chabot
31e7ce762c Improve InstrumentationTestRunner exception handling.
This commit fixes two somewhat related problems:
  - Attempting to run a method which does not exist caused a runtime
exception which stopped the test run. Change this so the runner reports
an individual test failure instead
  - A runtime exception during the test run would cause it to stop
completely, with no information dumped to the logcat or stdout. Now
exceptions are trapped and reported to stdout.

Also added associated unit tests to test these two conditions.

Related bug 2812262.

Change-Id: I383f9b9bad99f14cb51071800fa9bdbf6a6a1119
2010-07-07 17:33:22 -07:00
Fabrice Di Meglio
36f7784a4c Fix bug #2779582 (Columns cleanup for the Calendars table)
- suppress deprecated "url" column
- replace eventsUrl / editUrl / selfUrl columns by sync1 / sync2 / sync3

Change-Id: I2bff61a90655c98ee0964a880934c514b42ac342
2010-07-07 17:28:52 -07:00
Dan Tasse
7017e0d5c3 am f3f25bf8: Added some javadoc to Camera.takePicture()
Merge commit 'f3f25bf80b7d21f12442da8f82d17c79dd371692' into gingerbread-plus-aosp

* commit 'f3f25bf80b7d21f12442da8f82d17c79dd371692':
  Added some javadoc to Camera.takePicture()
2010-07-07 17:21:46 -07:00
Dan Tasse
f3f25bf80b Added some javadoc to Camera.takePicture()
Change-Id: I62597a1417647eeac7611eaccd0df3bda210e3e7
2010-07-07 17:17:06 -07:00
Jason Sams
6c8c2f22e9 Fix image processing resource problem for non high-density devices.
Protect include file.

Change-Id: I5c6721033b37e35261b9fe424d74d3aef0620791
2010-07-07 17:08:07 -07:00
Jason Sams
0b9a22cf78 Add boolean support for setVar.
Change-Id: Id64f3b2e43e19fc2a2d5fd81bb98d9ca67aae843
2010-07-07 17:08:07 -07:00
Scott Main
1c9bada4b4 docs: add caution about adt in eclipse 3.6
Change-Id: I37c920f6a5290d891c4a6dea5978147a50eec807
2010-07-07 16:47:16 -07:00
Vasu Nori
9bf225ef7b documentation about not using journal_mode if using WAL
apps should not setting journal_mode if the application is
using a connection pool for readers by calling the method
SQLiteDatabase.enableWriteAheadLogging()

Change-Id: I9ddb32638171c6277ca94381a1b5d4b39b92b386
2010-07-07 16:38:28 -07:00
Eric Laurent
b91881fdd1 am dacabf97: Merge "Added Visualizer effect." into gingerbread
Merge commit 'dacabf97c609a040ada857a7da6c560097448ae3' into gingerbread-plus-aosp

* commit 'dacabf97c609a040ada857a7da6c560097448ae3':
  Added Visualizer effect.
2010-07-07 16:34:57 -07:00
Eric Laurent
dacabf97c6 Merge "Added Visualizer effect." into gingerbread 2010-07-07 16:23:30 -07:00
Joe Onorato
a5b38cab74 top and bottom can't be the same thing
Change-Id: Ia5e4684db6dab390394f11182612c45818c7bcc0
2010-07-07 18:35:58 -04:00
Vasu Nori
35111ee4a4 Merge "for WAL to work, can't keep prepared SQL stmt_id in SQLiteStatement" 2010-07-07 15:35:26 -07:00
Vasu Nori
2827d6d974 for WAL to work, can't keep prepared SQL stmt_id in SQLiteStatement
Some (including the Contacts app) do the following:
  1. Open database
  2. As part of database_connection.onCreate(),
       Create some SQLiteStatement objects to cache them in the process
  3. attach databases
WAL doesn't work with attached databases. so, apps doing the above
should enable WAL only if there are no attached databases.

But we would like to enable WAL automatically for all apps after step #1 above
and disable WAL if the app subsequently does 'attach database' SQL.

this works only if there are no SQLiteStatement objects created in step # 2,
because SQLiteStatements cwmaintain a hard-reference to the database connection
for life and also to the prepared SQL statement id.
It is quite difficult to disable WAL in step # 3
    if it is enabled in step # 1
    and then a connection pool gets used by step # 2

would make WAL disabling easier if SQLiteStatement refers to prepared SQL
statement id only when it is needed (during binding and execute calls)
and thus NOT tied to a spacific database conenction.

also, from the standpoint of not blocking readers, it helps NOT to have
SQLiteStatement be married to a database connection and prepared SQL statement
id for life.

Change-Id: I464d57042965a28d2bde88e0f44b66ec119b40dc
2010-07-07 15:33:42 -07:00
Joe Onorato
34bcebca70 Let the window manager place the rest of the windows on screen when the status bar is at the bottom.
Change-Id: I29c43beee047bb99695a34e6b202ff3f8400c8c2
2010-07-07 18:33:14 -04:00
Joe Onorato
52c1dc2fd9 buttons on the bottom
Change-Id: I52184ad2752c38bcc4c7646b404f3f305e0ac4b6
2010-07-07 18:33:14 -04:00
Joe Onorato
86f9bd2fd0 Add KeyButtonView
Change-Id: Ic32076c07bd45cbf2a6db25d8e8e933701fdf8b2
2010-07-07 18:33:14 -04:00
Joe Onorato
119a4015f0 add a button area
Change-Id: I78171b3d6cc44a5984e5f602565228909f3e1c00
2010-07-07 18:33:14 -04:00
Romain Guy
290357aca8 Merge "Simpler way to deal with the FBO multi-cache." 2010-07-07 15:18:33 -07:00
Romain Guy
6c81893c62 Simpler way to deal with the FBO multi-cache.
This change removes the need for the SortedList and instead just
add a generated id to each FBO stored in the cache. This is an
artificial way to store several FBOs with the same dimensions.

Change-Id: I9638364e9bdc0f2391261937a0c86096f20505bf
2010-07-07 15:15:32 -07:00
Dirk Dougherty
182b96618b am 3338775d: am 4b9baa69: am 2651504c: (-s ours) Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo
Merge commit '3338775df7a19e0785c9badcedd90b99cda22013'

* commit '3338775df7a19e0785c9badcedd90b99cda22013':
  Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
2010-07-07 15:11:02 -07:00
Dirk Dougherty
3338775df7 am 4b9baa69: am 2651504c: (-s ours) Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo
Merge commit '4b9baa69f3b3146edbc623f0670103265c4f4fe5' into gingerbread-plus-aosp

* commit '4b9baa69f3b3146edbc623f0670103265c4f4fe5':
  Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
2010-07-07 15:08:59 -07:00
Dirk Dougherty
4b9baa69f3 am 2651504c: (-s ours) Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo
Merge commit '2651504c020f07847bafa3d539c36f1396629669' into gingerbread

* commit '2651504c020f07847bafa3d539c36f1396629669':
  Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
2010-07-07 15:06:35 -07:00
James Dong
0920b1cd7d am b3598832: am c4243342: Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread
Merge commit 'b35988329ac1a574898db9226039e37e352c57a8'

* commit 'b35988329ac1a574898db9226039e37e352c57a8':
  Allow application to set two more encoding paramters: video profile and level
2010-07-07 15:00:28 -07:00
James Dong
1193ef6c32 am 7b3f3048: am 58c35573: Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread
Merge commit '7b3f3048725dcb217599590fcb55a5b26b93dc4e'

* commit '7b3f3048725dcb217599590fcb55a5b26b93dc4e':
  Fix some bugs in the MediaProfileReader
2010-07-07 15:00:22 -07:00
Kenny Root
6cfbb37957 Merge "Support bidi layout for drawTextOnPath." 2010-07-07 14:59:09 -07:00
James Dong
b35988329a am c4243342: Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread
Merge commit 'c42433427a7ed51b5577b2587bf6cb0af903ebf8' into gingerbread-plus-aosp

* commit 'c42433427a7ed51b5577b2587bf6cb0af903ebf8':
  Allow application to set two more encoding paramters: video profile and level
2010-07-07 14:58:30 -07:00
James Dong
7b3f304872 am 58c35573: Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread
Merge commit '58c35573cc677b736efefa267eba8727d4411999' into gingerbread-plus-aosp

* commit '58c35573cc677b736efefa267eba8727d4411999':
  Fix some bugs in the MediaProfileReader
2010-07-07 14:58:26 -07:00
Doug Felt
4beb8ff717 Support bidi layout for drawTextOnPath.
Change-Id: Ie5867fdb66fe15336774e20d65fa63e0d05bf6fe
2010-07-07 14:58:03 -07:00
James Dong
c42433427a Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread 2010-07-07 14:56:33 -07:00
James Dong
58c35573cc Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread 2010-07-07 14:56:20 -07:00