Yu Shan Emily Lau
6f2d58506e
am 8c937a17: Merge change 22379 into donut
...
Merge commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78' into eclair
* commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78':
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
2009-08-24 10:14:25 -07:00
Android (Google) Code Review
e7004a70a9
Merge change 22379 into donut
...
* changes:
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.
2009-08-24 10:11:00 -07:00
Android (Google) Code Review
c16d69317b
Merge change 22377 into eclair
...
* changes:
The new webkit won't keep RAM cache if http header has "no-store". So remove it from StreamLoader. And fix the code where we only want to cache network result.
2009-08-24 08:45:06 -07:00
Android (Google) Code Review
c0c18c332d
Merge change 22262 into eclair
...
* changes:
Adds Java-side of logic to make Geolocation obey Browser 'Enable Location' setting.
2009-08-24 03:07:15 -07:00
Android (Google) Code Review
a655d9cce1
Merge change 21978 into eclair
...
* changes:
Adds the ability to set Geolocation permissions from DumpRenderTree on Android.
2009-08-24 02:28:23 -07:00
Scott Su
119447dab5
Remove frameworks/base/im since these stuff are only used by IM app
2009-08-23 23:41:50 -07:00
Android (Google) Code Review
bff63b58ab
Merge change 22160 into eclair
...
* changes:
Add dither XML flag to StateListDrawable.
2009-08-22 22:57:30 -07:00
Android (Google) Code Review
b65c9a3485
Merge change 22383 into eclair
...
* changes:
Remove the decleration of com.android.im.plugin.jar in platform.xml Add a column definition for keep_signed_in when query the active account with a given provider
2009-08-22 11:07:20 -07:00
Eric Fischer
4bc4ff7074
am 36d5aaec: Merge change 22322 into donut
...
Merge commit '36d5aaec2ee1f11ea80639c8194e4aac2be3892d' into eclair
* commit '36d5aaec2ee1f11ea80639c8194e4aac2be3892d':
Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
2009-08-22 07:43:44 -07:00
Mathias Agopian
9429e9c8ad
first step for fixing [2066786] EGL object lifetime management doesn't respect the EGL spec
...
this change fixes the lifetime mgt of EGLSurface, EGLContext and EGLImageKHR in the EGL wrapper.
EGLDisplay is still somewhat bogus and libagl's EGL is still incorrect.
The idea of the change is that EGL objects are put in a list when created and removed when destroyed.
Before each use, we first verify if the object is in the list and if so a reference is taken and kept
for the scope of the whole EGL API being called, if not, an error is returned.
Upon object destruction, the object is simply marked as "terminated" (this is not protected by a lock
because it doesn't really matter). This flag is only used to deny access to the object by other APIs
while it's still valid (for instance current or being used by another function in another thread).
A reference is also removed and the object can then actually be destroyed when going out of scope.
2009-08-21 19:45:44 -07:00
Android (Google) Code Review
f5fcc8b50c
Merge change 22362 into eclair
...
* changes:
Fix +NANP issue and cleanup plus code conversion.
2009-08-21 17:05:24 -07:00
Android (Google) Code Review
56b1ba2020
Merge change 22352 into eclair
...
* changes:
Fix FallRS by keeping a reference to the mesh.
2009-08-21 16:30:13 -07:00
Android (Google) Code Review
29a0c373ab
Merge change 22328 into eclair
...
* changes:
Fix recurrence parsing for all-day events.
2009-08-21 15:58:43 -07:00
Android (Google) Code Review
299297a341
Merge change 22344 into eclair
...
* changes:
fix [2070341] [FAST BLOCKER] can't successfully setup erc52
2009-08-21 15:45:22 -07:00
Mathias Agopian
04bc12bd43
fix [2070341] [FAST BLOCKER] can't successfully setup erc52
2009-08-21 15:44:17 -07:00
Android (Google) Code Review
cbd6b7f4d8
Merge change 22331 into eclair
...
* changes:
add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.
2009-08-21 15:20:31 -07:00
Android (Google) Code Review
e50b5789ce
Merge change 22322 into donut
...
* changes:
Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
2009-08-21 14:47:41 -07:00
Android (Google) Code Review
c4f351eb2a
Merge change 22314 into eclair
...
* changes:
Purge cache
2009-08-21 14:10:12 -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
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
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
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
e0037413f2
resolved conflicts for merge of 081a136d to eclair
2009-08-21 12:59:04 -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
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 (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