Tom Taylor
dc66a378b8
am 00ddbcaa: Merge change 22314 into eclair
...
Merge commit '00ddbcaa2e8a181a2efd5456a65c619ed941e4b0' into eclair-plus-aosp
* commit '00ddbcaa2e8a181a2efd5456a65c619ed941e4b0':
Purge cache
2009-08-21 14:12:45 -07:00
Android (Google) Code Review
c4f351eb2a
Merge change 22314 into eclair
...
* changes:
Purge cache
2009-08-21 14:10:12 -07:00
Dmitri Plotnikov
45cdfd5ce8
am 4178b9bd: Merge change 22316 into eclair
...
Merge commit '4178b9bd8e8a9d62e8e4e759c419e0d2a4ab0df6' into eclair-plus-aosp
* commit '4178b9bd8e8a9d62e8e4e759c419e0d2a4ab0df6':
Cleaning up Presence API
2009-08-21 13:48:01 -07:00
Li Zhe
19fb39e2a6
am 6c6d822f: Merge change 22318 into eclair
...
Merge commit '6c6d822f7b7ec967aeff3e4d2afde0ff25732aa6' into eclair-plus-aosp
* commit '6c6d822f7b7ec967aeff3e4d2afde0ff25732aa6':
Framework changes to support HSDPA/HSUPA/HSPA
2009-08-21 13:45:30 -07:00
Android (Google) Code Review
687f6f09ea
Merge change 22316 into eclair
...
* changes:
Cleaning up Presence API
2009-08-21 13:45:22 -07:00
Android (Google) Code Review
e2577786f1
Merge change 22318 into eclair
...
* changes:
Framework changes to support HSDPA/HSUPA/HSPA HSDPA: High-Speed Downlink Packet Access HSUPA: High-Speend Uplink Packet Access HSPA: High-Speed Packet Access
2009-08-21 13:43:01 -07:00
Dmitri Plotnikov
a101093201
am 358e6e3c: Merge change 22292 into eclair
...
Merge commit '358e6e3c121f8ac5ac4a2c99b9d2211dfb2d3083' into eclair-plus-aosp
* commit '358e6e3c121f8ac5ac4a2c99b9d2211dfb2d3083':
Adding a "Photo" directory under Contacts.
2009-08-21 13:42:54 -07:00
Android (Google) Code Review
ca7bd9168d
Merge change 22292 into eclair
...
* changes:
Adding a "Photo" directory under Contacts.
2009-08-21 13:40:40 -07:00
Romain Guy
8f0871cafc
am cc0a17cb: Merge change 22290 into eclair
...
Merge commit 'cc0a17cb08c6a6ee2f27c00b7f658e4734fdf0c9' into eclair-plus-aosp
* commit 'cc0a17cb08c6a6ee2f27c00b7f658e4734fdf0c9':
Fix typo: the x offset was assigned to the y coordinate.
2009-08-21 13:38:44 -07:00
Android (Google) Code Review
7647aa3bd1
Merge change 22290 into eclair
...
* changes:
Fix typo: the x offset was assigned to the y coordinate.
2009-08-21 13:36:30 -07:00
Xavier Ducrohet
cc2bd7678b
am 51afbd30: Merge change 22308 into eclair
...
Merge commit '51afbd308dff8bd7accf5510e60367107d4c40a1' into eclair-plus-aosp
* commit '51afbd308dff8bd7accf5510e60367107d4c40a1':
Replace fullHeight support by fullSize (height and width)
2009-08-21 13:28:48 -07:00
Android (Google) Code Review
dd7639ccfb
Merge change 22308 into eclair
...
* changes:
Replace fullHeight support by fullSize (height and width)
2009-08-21 13:26:19 -07:00
Jean-Baptiste Queru
0205f73166
am dd03c613: resolved conflicts for merge of 081a136d to eclair
...
Merge commit 'dd03c6135f91df6d5d9e71de1487520dc3345742' into eclair-plus-aosp
* commit 'dd03c6135f91df6d5d9e71de1487520dc3345742':
Remove third party support for Quick Search Box (aka global search).
2009-08-21 13:01:22 -07:00
Jean-Baptiste Queru
e0037413f2
resolved conflicts for merge of 081a136d to eclair
2009-08-21 12:59:04 -07:00
Jaikumar Ganesh
5be072f271
am bfcfb7ee: Merge change 22302 into eclair
...
Merge commit 'bfcfb7eec61bd196cfd91f7b2c5715751308c048' into eclair-plus-aosp
* commit 'bfcfb7eec61bd196cfd91f7b2c5715751308c048':
Set BondState to Canceled when user cancels pairing.
2009-08-21 11:56:06 -07:00
Android (Google) Code Review
dcab2ad3b6
Merge change 22302 into eclair
...
* changes:
Set BondState to Canceled when user cancels pairing.
2009-08-21 11:54:15 -07:00
Jean-Baptiste Queru
e4db6fa09c
merge from open-source master
2009-08-21 10:19:09 -07:00
Android (Google) Code Review
0d425d1724
Merge change 22282 into eclair
...
* changes:
Fix Calling screen shows "In Call" on pressing mute button
2009-08-21 09:55:41 -07:00
Android (Google) Code Review
4fb7fd3782
Merge change 22281 into eclair
...
* changes:
Delay radio reset to wait for data cleanup in CdmaDataConnectionTracker
2009-08-21 09:50:48 -07:00
Android Code Review
931857b925
Merge change 10274
...
* changes:
Ignore pause and seek for live streaming.
2009-08-21 06:23:31 -07:00
Android (Google) Code Review
f2dfb1316b
Merge change 22135 into eclair
...
* changes:
Support full length rendering.
2009-08-20 20:25:28 -07:00
Android (Google) Code Review
cc21604147
Merge change 22178 into eclair
...
* changes:
- add a reset to EntityIterator to allow it to go back to the beginning - clean up the debug printing of SyncResult
2009-08-20 20:02:37 -07:00
Bob Lee
a1f6cd917c
am e97c2006: Updated Browser and MCS to use shared default trust manager instead of initializing their own copies.
...
Merge commit 'e97c2006bf7c391c933307e520a392e532aa5d6a' into eclair
* commit 'e97c2006bf7c391c933307e520a392e532aa5d6a':
Updated Browser and MCS to use shared default trust manager instead of initializing their own copies.
2009-08-20 19:31:59 -07:00
Android (Google) Code Review
60ff986692
Merge change 22222 into eclair
...
* changes:
fix a bug in ComponentSizeChooser where it could pick a software EGLConfig instead of a better h/w one.
2009-08-20 19:12:51 -07:00
Mathias Agopian
baca89c06a
fix a bug in ComponentSizeChooser where it could pick a software EGLConfig instead of a better h/w one.
...
We now just try to honor the stencil / depth buffer "at least", while doing a "shortest distance" on the colors.
2009-08-20 19:09:34 -07:00
Android (Google) Code Review
7c9fea2ead
Merge change 22208 into eclair
...
* changes:
Fixed the missing EOL in last line of crashed tests list file. Also fixed some whitespaces.
2009-08-20 18:22:07 -07:00
Android (Google) Code Review
33dcc6a57d
Merge change 22186 into eclair
...
* changes:
Allow null to be re-bound as a root script. This was always legal from native and just a limitation of the java binding for the API.
2009-08-20 17:24:52 -07:00
Android (Google) Code Review
cab952d5b8
Merge change 22086 into eclair
...
* changes:
Tweak the ContactsHeaderWidget to match the newest specs.
2009-08-20 17:12:43 -07:00
Android (Google) Code Review
9bbc9ac002
Merge change 22169 into eclair
...
* changes:
Cleanup the Galaxy, add a few RS functions for Grass.
2009-08-20 17:08:54 -07:00
Android (Google) Code Review
239080103b
Merge change 22163 into eclair
...
* changes:
Point Sprites
2009-08-20 16:53:25 -07:00
Android (Google) Code Review
c7706719e5
Merge change 22154 into eclair
...
* changes:
Fix fastscroll overlay size on WVGA by using dip.
2009-08-20 16:49:25 -07:00
Eric Fischer
bc9d77b57a
am b7aec912: (-s ours) Import revised translations. DO NOT MERGE
...
Merge commit 'b7aec9124a44c60509c00f1d306fd08860d6197c' into eclair
* commit 'b7aec9124a44c60509c00f1d306fd08860d6197c':
Import revised translations. DO NOT MERGE
2009-08-20 16:00:45 -07:00
Scott Main
f5a045fc9e
am 185d74ba: Merge change 21977 into donut
...
Merge commit '185d74ba56ccaca3f4bb105d00562bcd5a82c788' into eclair
* commit '185d74ba56ccaca3f4bb105d00562bcd5a82c788':
docs only.
2009-08-20 16:00:41 -07:00
Android (Google) Code Review
47d2f98aff
Merge change 22144 into eclair
...
* changes:
Enable specification of http:// urls in stagefright commandline tool.
2009-08-20 15:55:59 -07:00
Android (Google) Code Review
f27cf12088
Merge change 22132 into eclair
...
* changes:
build fix
2009-08-20 15:09:04 -07:00
Android (Google) Code Review
7b2e0bd7f7
Merge change 22008 into eclair
...
* changes:
When bringing up the media controller view, focus the play/pause button.
2009-08-20 15:08:36 -07:00
Android (Google) Code Review
29ea1e0b18
Merge change 22127 into eclair
...
* changes:
more cdma sms debug logging
2009-08-20 14:43:17 -07:00
Android (Google) Code Review
676650b8c5
Merge change 22092 into eclair
...
* changes:
Dynamically allocate a pair of MemoryHeaps according buffer count/sizes required by the OMX component, respect JPEG compressed size.
2009-08-20 13:58:17 -07:00
Android (Google) Code Review
e5e90fc16a
Merge change 22105 into eclair
...
* changes:
Add calendar sliding windows setting.
2009-08-20 13:46:06 -07:00
Android (Google) Code Review
e5d74ad3f9
Merge change 22093 into eclair
...
* changes:
cdma sms encoding tweaks and logging / debugging annotations.
2009-08-20 13:22:12 -07:00
Android (Google) Code Review
b89fa8b043
Merge change 22082 into eclair
...
* changes:
Address b/2064664 by setting mThumbOffset to half the width of the thumb by default.
2009-08-20 12:22:08 -07:00
Android (Google) Code Review
8355a71a48
Merge change 22066 into eclair
...
* changes:
Add offset handling in MemoryHeapBase class
2009-08-20 12:06:54 -07:00
Android (Google) Code Review
2f142745be
Merge change 22060 into eclair
...
* changes:
better error handling in EGL
2009-08-20 11:52:39 -07:00
Android (Google) Code Review
bb32823aa2
Merge change 22089 into eclair
...
* changes:
The MetaData API is optional and getMetadata may return null if unsupported.
2009-08-20 11:43:50 -07:00
Android (Google) Code Review
a9a5a90d03
Merge change 21977 into donut
...
* changes:
docs only. add reference information for new <path-permission> element
2009-08-20 11:19:08 -07:00
Benny Wong
d4851d74ac
Add offset handling in MemoryHeapBase class
2009-08-20 03:55:20 -07:00
Mathias Agopian
0696a57229
better error handling in EGL
2009-08-20 00:12:56 -07:00
Android (Google) Code Review
8039e6edac
Merge change 22049 into eclair
...
* changes:
Fix various issues found when testing Mms.
2009-08-19 23:30:42 -07:00
Android (Google) Code Review
2a9511952f
Merge change 22045 into eclair
...
* changes:
Fix bug 2045914: When pressing 2 keys, sometimes the second key gets stuck.
2009-08-19 22:59:35 -07:00
Android (Google) Code Review
d906d4b767
Merge change 22055 into eclair
...
* changes:
Improve Obex compatibility
2009-08-19 21:09:45 -07:00