Nick Pelly
8d151d2c43
am 53f33d84: Revert "Remove STOPSHIP comment."
...
Merge commit '53f33d84776a0bad668e361365a7049b16f8a929' into eclair-mr2
* commit '53f33d84776a0bad668e361365a7049b16f8a929':
Revert "Remove STOPSHIP comment."
2009-10-14 12:37:06 -07:00
Nick Pelly
e79df1d097
am a04ca9b4: Merge change I2492bffe into eclair
...
Merge commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085' into eclair-mr2
* commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085':
Remove STOPSHIP comment.
2009-10-14 12:03:19 -07:00
Android (Google) Code Review
f7f46955f7
Merge change I2492bffe into eclair
...
* changes:
Remove STOPSHIP comment.
2009-10-14 14:55:44 -04:00
Katarina Stenstedt
2a7e575077
am 399fc263: Merge change If30c5e20 into eclair
...
Merge commit '399fc2636f1332986f319df3cf8ae56344070c51' into eclair-mr2
* commit '399fc2636f1332986f319df3cf8ae56344070c51':
SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial.
2009-10-14 10:04:53 -07:00
Android (Google) Code Review
bf89a25446
Merge change If30c5e20 into eclair
...
* changes:
SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial. Changed image links to use @docRoot.
2009-10-14 12:52:00 -04:00
Dmitri Plotnikov
f3df75adee
am fe4c8715: Making new Contacts APIs visible in Eclair SDK - Part II
...
Merge commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6' into eclair-mr2
* commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6':
Making new Contacts APIs visible in Eclair SDK - Part II
2009-10-14 07:38:11 -07:00
Dave Sparks
16ee0422e2
am 8c471d1d: Merge change I4ef3e82f into eclair
...
Merge commit '8c471d1def1027d025528b419cc8a1cdb68a4489' into eclair-mr2
* commit '8c471d1def1027d025528b419cc8a1cdb68a4489':
7 more ringtones. Now with more Dr. No!
2009-10-14 07:38:04 -07:00
Dianne Hackborn
c7c865dc51
am cbf77e9b: Merge change I875200fe into eclair
...
Merge commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13' into eclair-mr2
* commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13':
Another fix for #2186897 : Cannot unlock the device by swiping
2009-10-14 07:37:38 -07:00
Android (Google) Code Review
136a4d0674
Merge change I4c64bb78 into eclair-mr2
...
* changes:
add hidden method to draw entire page into a canvas, with no view-chrome. For testing.
2009-10-14 10:02:11 -04:00
Android (Google) Code Review
90e1850c05
Merge change I4ef3e82f into eclair
...
* changes:
7 more ringtones. Now with more Dr. No!
2009-10-14 03:13:12 -04:00
Android (Google) Code Review
d6e991e167
Merge change I875200fe into eclair
...
* changes:
Another fix for #2186897 : Cannot unlock the device by swiping
2009-10-14 01:51:00 -04:00
Dianne Hackborn
4e8286057d
am b10e2f1a: Merge change Iac534225 into eclair
...
Merge commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11' into eclair-mr2
* commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11':
Fix issue #2186709 : Can't unlock the device for a while
2009-10-13 20:19:39 -07:00
Android (Google) Code Review
f1e8da6637
Merge change Iac534225 into eclair
...
* changes:
Fix issue #2186709 : Can't unlock the device for a while
2009-10-13 23:13:37 -04:00
Android (Google) Code Review
d3e70c2737
Merge change Ib3558f35 into eclair-mr2
...
* changes:
Make our choice of surface explicit.
2009-10-13 22:54:58 -04:00
Android (Google) Code Review
1297164a35
Merge change I28023911 into eclair-mr2
...
* changes:
Add additional error checking of EGL function calls.
2009-10-13 22:54:15 -04:00
Jack Palevich
d594fe1740
Make our choice of surface explicit.
2009-10-13 19:52:44 -07:00
Dmitri Plotnikov
93331c3d22
am 6e144ad8: Making new Contacts APIs visible in Eclair SDK
...
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-mr2
* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
Making new Contacts APIs visible in Eclair SDK
2009-10-13 18:47:40 -07:00
Android (Google) Code Review
66bde586fb
Merge change Ic52ba78c into eclair-mr2
...
* changes:
Allow multiple OpenGL contexts on systems that support them.
2009-10-13 21:08:17 -04:00
Jeff Sharkey
b32cc07b61
am a78a9d4c: Correct non-opaque list separator assets.
...
Merge commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0' into eclair-mr2
* commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0':
Correct non-opaque list separator assets.
2009-10-13 18:05:48 -07:00
Android (Google) Code Review
c63bdd1ebd
Merge change I4410ec8f into eclair-mr2
...
* changes:
Framework-side DropBox service that maintains a size-bounded queue of data chunks (sort of a blob-oriented logcat).
2009-10-13 21:01:26 -04:00
Android (Google) Code Review
dea428b4e0
Merge change I69e21f5f into eclair-mr2
...
* changes:
GLDual test application.
2009-10-13 17:57:50 -04:00
Jack Palevich
9bd30f05e8
GLDual test application.
...
Draws two images at once, one GL based, one GL2 based.
2009-10-13 14:56:00 -07:00
Android (Google) Code Review
b8bb011df8
Merge change I7fa8c508 into eclair-mr2
...
* changes:
make erase-password-on-SIM-change optional
2009-10-13 17:26:48 -04:00
Robert Greenwalt
5e657ee86b
am 64d54042: Merge change I61c08260 into eclair
...
Merge commit '64d54042ff5c2c736a65f200296dbc3bceaa9029' into eclair-mr2
* commit '64d54042ff5c2c736a65f200296dbc3bceaa9029':
Futher reduce the logging of EriManager.
2009-10-13 14:11:54 -07:00
Android (Google) Code Review
7f2eeca5ba
Merge change I61c08260 into eclair
...
* changes:
Futher reduce the logging of EriManager.
2009-10-13 17:07:10 -04:00
Android (Google) Code Review
8716c13580
Merge change I564b5b00 into eclair-mr2
...
* changes:
add "junk path" -k option to aapt
2009-10-13 16:41:21 -04:00
Android (Google) Code Review
08f79ebf90
Merge change Iaa321588 into eclair-mr2
...
* changes:
Add "deleted" row to Events table.
2009-10-13 16:10:32 -04:00
Android (Google) Code Review
c85ae90db0
Merge change Id5ba82a1 into eclair-mr2
...
* changes:
Prevent getFile from copying when the file is too large.
2009-10-13 15:09:18 -04:00
Dianne Hackborn
bd351e8bfd
am 2a21a77d: Merge change I1369e9ab into eclair
...
Merge commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d' into eclair-mr2
* commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d':
Work on issue #2144454 : Inconsistent swipes...
2009-10-13 11:52:34 -07:00
Android (Google) Code Review
8ace1a7d11
Merge change I1369e9ab into eclair
...
* changes:
Work on issue #2144454 : Inconsistent swipes...
2009-10-13 14:45:56 -04:00
Android (Google) Code Review
fd5d36bb78
Merge change I3dafca18 into eclair-mr2
...
* changes:
Enabling plugin surfaces to update their position in the UI.
2009-10-13 14:39:37 -04:00
Android (Google) Code Review
d84946c273
Merge change I73b00501 into eclair-mr2
...
* changes:
Check cursor and URI value for nullity to prevent NPE.
2009-10-13 13:43:18 -04:00
Android (Google) Code Review
ebd103486b
Merge change Ibd7b43bb into eclair-mr2
...
* changes:
Separated private from public header files.
2009-10-13 13:38:28 -04:00
Android (Google) Code Review
1e3945aca8
Merge change I8d87cd98 into eclair-mr2
...
* changes:
Fix various compiler warnings accumulated over time.
2009-10-13 13:31:58 -04:00
Robert Greenwalt
fa9a2ee309
am 16cb04ab: Merge change If1acb2dd into eclair
...
Merge commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1' into eclair-mr2
* commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1':
Add a little logging to diagnose wifi cycle bug
2009-10-13 09:56:40 -07:00
Dave Sparks
2073967d00
am 69e2ef47: Merge change I9f93ce61 into eclair
...
Merge commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42' into eclair-mr2
* commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42':
Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 09:56:26 -07:00
Android (Google) Code Review
676a3f3ca4
Merge change If1acb2dd into eclair
...
* changes:
Add a little logging to diagnose wifi cycle bug
2009-10-13 12:45:30 -04:00
Android (Google) Code Review
f4fc80918c
Merge change I9f93ce61 into eclair
...
* changes:
Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 06:02:59 -04:00
Grace Kloba
7d8784664b
am 2e778c17: Merge change I124356f6 into eclair
...
Merge commit '2e778c176d17c295f475141bddda9dca5cd65fce' into eclair-mr2
* commit '2e778c176d17c295f475141bddda9dca5cd65fce':
Continue caching "POST" result so that we won't get
2009-10-12 18:36:17 -07:00
Android (Google) Code Review
7b70ca95c5
Merge change Ic6d1545d into eclair-mr2
...
* changes:
Support double-quote SSID in WifiService.
2009-10-12 21:33:04 -04:00
Android (Google) Code Review
295b1d2c74
Merge change I124356f6 into eclair
...
* changes:
Continue caching "POST" result so that we won't get the resubmission warning when back to Google search result.
2009-10-12 21:30:04 -04:00
Android (Google) Code Review
9fd2393c2b
Merge change I98276091 into eclair-mr2
...
* changes:
Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
2009-10-12 19:01:28 -04:00
Android (Google) Code Review
be2b4a7b9d
Merge change I83b3bddf into eclair-mr2
...
* changes:
Add a new TestSuites: VCardTests
2009-10-12 17:44:19 -04:00
Libin Tang
c94b6e6818
am febb94cd: Make standard roaming indicator display indications configurable
...
Merge commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5' into eclair-mr2
* commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5':
Make standard roaming indicator display indications configurable
2009-10-12 14:23:09 -07:00
Android (Google) Code Review
20cfad1335
Merge change I2a52a60a into eclair-mr2
...
* changes:
Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
2009-10-12 17:03:12 -04:00
Robert Greenwalt
79adadff83
am 6d02f3f3: Merge change I71f48a21 into eclair
...
Merge commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84' into eclair-mr2
* commit '6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84':
Reduce the amount of EriManager Logging.
2009-10-12 12:33:42 -07:00
Android (Google) Code Review
90ba1f8aed
Merge change I71f48a21 into eclair
...
* changes:
Reduce the amount of EriManager Logging.
2009-10-12 15:25:51 -04:00
Dima Zavin
1533d8eabc
am 98b3def2: Merge change I6261ab54 into eclair
...
Merge commit '98b3def2983e78409002cf406574bbc8eeef8bfd' into eclair-mr2
* commit '98b3def2983e78409002cf406574bbc8eeef8bfd':
Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
2009-10-12 12:08:19 -07:00
Android (Google) Code Review
c811a2e0c9
Merge change I6261ab54 into eclair
...
* changes:
Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
2009-10-12 15:01:43 -04:00
Android (Google) Code Review
3aaa924bb8
Merge change Ifd71653f into eclair-mr2
...
* changes:
add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
2009-10-12 14:52:45 -04:00