13913 Commits

Author SHA1 Message Date
Jack Palevich
8da3ac92a6 resolved conflicts for merge of 3f857b78 to eclair-mr2 2009-11-10 08:04:53 +08:00
Gloria Wang
c060d86f7d Check whether test server is up before running tests which use streaming files. 2009-11-09 15:51:12 -08:00
Xavier Ducrohet
9a4593ffcc Support for fallback fonts in layoutlib.
BUG 2041229

Change-Id: Ib12bcb7f6d8f0e4c2b51871f8129ecf51fa938ee
2009-11-09 14:55:08 -08:00
Cynthia Wong
7e6422c1cc am 6720bb83: am 26c91fa6: Merge change I4ff96000 into eclair-mr2
Merge commit '6720bb8314600a2b55a18159b4a22dc4b18aec88'

* commit '6720bb8314600a2b55a18159b4a22dc4b18aec88':
  new gservices flag for delaying bad gmail operations
2009-11-09 14:14:55 -08:00
Derek Sollenberger
6f240aec18 am 29c00b0f: am 521123e0: Merge change I9e28c4ce into eclair-mr2
Merge commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf'

* commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf':
  Allow plugins to load java classes from their apk.
2009-11-09 13:51:18 -08:00
Mike Lockwood
6b2f50de31 am 65fac51f: am 9882f385: am 96fce6e1: Merge change I62704736 into eclair
Merge commit '65fac51faf8ffe759a634497b1654a3b47406107'

* commit '65fac51faf8ffe759a634497b1654a3b47406107':
  Do not apply light sensor debounce logic while the light sensor is still warming up.
2009-11-09 13:51:07 -08:00
Android (Google) Code Review
3ea2ae7d6f Merge change I47aa76bf into eclair
* changes:
  Add new notifications and ringtones.
2009-11-09 13:46:17 -08:00
Cynthia Wong
6720bb8314 am 26c91fa6: Merge change I4ff96000 into eclair-mr2
Merge commit '26c91fa694464c79de39988f9f42cee375ff0a14' into eclair-mr2-plus-aosp

* commit '26c91fa694464c79de39988f9f42cee375ff0a14':
  new gservices flag for delaying bad gmail operations
2009-11-09 13:26:00 -08:00
Android (Google) Code Review
26c91fa694 Merge change I4ff96000 into eclair-mr2
* changes:
  new gservices flag for delaying bad gmail operations
2009-11-09 13:23:23 -08:00
Derek Sollenberger
29c00b0f09 am 521123e0: Merge change I9e28c4ce into eclair-mr2
Merge commit '521123e0ed91348be81d3d754d3ee13ecf454ced' into eclair-mr2-plus-aosp

* commit '521123e0ed91348be81d3d754d3ee13ecf454ced':
  Allow plugins to load java classes from their apk.
2009-11-09 12:45:29 -08:00
Android (Google) Code Review
521123e0ed Merge change I9e28c4ce into eclair-mr2
* changes:
  Allow plugins to load java classes from their apk.
2009-11-09 12:42:35 -08:00
Dave Sparks
253c595761 Add new notifications and ringtones. 2009-11-09 12:41:09 -08:00
Android (Google) Code Review
fe225e25bd Merge change I70e1f7a6 into eclair
* changes:
  Fix the selection of locale from SIM mcc.
2009-11-09 12:37:22 -08:00
Dianne Hackborn
0be1f78c97 Fix issue #2246723: Only one Application object gets onCreate called
Change-Id: I83ba96fe81ad04258099d6f94a667dc7d9dd4fd3
2009-11-09 12:30:12 -08:00
Mike Lockwood
65fac51faf am 9882f385: am 96fce6e1: Merge change I62704736 into eclair
Merge commit '9882f38584882461dbfef229e4fe316dacebd9c5' into eclair-mr2-plus-aosp

* commit '9882f38584882461dbfef229e4fe316dacebd9c5':
  Do not apply light sensor debounce logic while the light sensor is still warming up.
2009-11-09 12:15:04 -08:00
Grace Kloba
22e7d825b8 am 977e8d28: am e81c9609: Merge change I8c92c39b into eclair-mr2
Merge commit '977e8d28e5e4f8dbb8997b2206a943e17f8be5bb'

* commit '977e8d28e5e4f8dbb8997b2206a943e17f8be5bb':
  Add postdata identifier so that if we cache the post
2009-11-09 12:12:35 -08:00
Daisuke Miyakawa
6ddfe00729 am c53cc103: am 0e983864: Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and "AGENT" line.
Merge commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e'

* commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e':
  Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
2009-11-09 12:12:24 -08:00
Daisuke Miyakawa
27700b7c19 am 75face7d: am df0ce741: Merge change I8c0747cf into eclair-mr2
Merge commit '75face7d2dad974781a5aaf48e0d20ebe6e0ca35'

* commit '75face7d2dad974781a5aaf48e0d20ebe6e0ca35':
  Make vCard parser invalid lines in vCard file which look like some comment.
2009-11-09 12:12:13 -08:00
Jeff Sharkey
1cbbec066d am 4024c46f: am 06dc03f2: Let RemoteViews nest children, allow ViewFlipper.
Merge commit '4024c46f91564ac49e022c5fcef85b8c6dba150b'

* commit '4024c46f91564ac49e022c5fcef85b8c6dba150b':
  Let RemoteViews nest children, allow ViewFlipper.
2009-11-09 12:11:54 -08:00
Jean-Baptiste Queru
3c08b74155 am ac94fbd0: merge from open-source master
Merge commit 'ac94fbd081450ae7f208e4525b23b36d90d382e0'

* commit 'ac94fbd081450ae7f208e4525b23b36d90d382e0':
  Capture failure of copybit->stretch()
  Fix obvious typo bug in egl.cpp
  LocationManagerService: Fix race when removing LocationListener
  Don't return when blocking is true.
  Fix of compatibility with multifunction extUSB adapters.
  Fix documentation example, per issue 895 on android.googlecode.com
2009-11-09 12:08:48 -08:00
Mike Lockwood
9882f38584 am 96fce6e1: Merge change I62704736 into eclair
Merge commit '96fce6e112aec1e09c82cfd7657381ce112dc555' into eclair-mr2

* commit '96fce6e112aec1e09c82cfd7657381ce112dc555':
  Do not apply light sensor debounce logic while the light sensor is still warming up.
2009-11-09 12:07:05 -08:00
Grace Kloba
977e8d28e5 am e81c9609: Merge change I8c92c39b into eclair-mr2
Merge commit 'e81c9609cc99d10045b70f79729b4b0edbf793c2' into eclair-mr2-plus-aosp

* commit 'e81c9609cc99d10045b70f79729b4b0edbf793c2':
  Add postdata identifier so that if we cache the post
2009-11-09 12:04:15 -08:00
Daisuke Miyakawa
c53cc10390 am 0e983864: Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and "AGENT" line.
Merge commit '0e983864fca215513de9664573dcc3bbadf41e79' into eclair-mr2-plus-aosp

* commit '0e983864fca215513de9664573dcc3bbadf41e79':
  Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
2009-11-09 12:04:03 -08:00
Daisuke Miyakawa
75face7d2d am df0ce741: Merge change I8c0747cf into eclair-mr2
Merge commit 'df0ce74126e75963a33201b6c98ce46837a2e55e' into eclair-mr2-plus-aosp

* commit 'df0ce74126e75963a33201b6c98ce46837a2e55e':
  Make vCard parser invalid lines in vCard file which look like some comment.
2009-11-09 12:03:53 -08:00
Jeff Sharkey
4024c46f91 am 06dc03f2: Let RemoteViews nest children, allow ViewFlipper.
Merge commit '06dc03f2cf98862717ba1aa0e858897363abc369' into eclair-mr2-plus-aosp

* commit '06dc03f2cf98862717ba1aa0e858897363abc369':
  Let RemoteViews nest children, allow ViewFlipper.
2009-11-09 12:03:40 -08:00
Derek Sollenberger
9e28c4ce66 Allow plugins to load java classes from their apk.
Provide the functions to be called from native code that take
the plugin's location and desired class name and then load that
class from the plugin's apk if it is available.

see http://b/2215696
2009-11-09 14:45:58 -05:00
Jean-Baptiste Queru
ac94fbd081 merge from open-source master 2009-11-09 11:00:18 -08:00
Android (Google) Code Review
e81c9609cc Merge change I8c92c39b into eclair-mr2
* changes:
  Add postdata identifier so that if we cache the post result, we will use (url+postIdentifier) as the key for the CacheResult.
2009-11-09 10:01:04 -08:00
Cynthia Wong
4ff960006f new gservices flag for delaying bad gmail operations 2009-11-09 09:42:14 -08:00
Android (Google) Code Review
090c60bb9d Merge change I73b60354 into eclair
* changes:
  AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
2009-11-09 08:53:11 -08:00
Android (Google) Code Review
2bb5375433 Merge change Icaf932d0 into eclair
* changes:
  Fix code example in Parcelable javadoc
2009-11-09 08:09:35 -08:00
Eric Laurent
73b603546d AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
This problem was encountered as a side effect of issue 2245298.
2009-11-09 04:45:39 -08:00
Android (Google) Code Review
93572eef41 Merge change Ifb9d6df3 into eclair
* changes:
  More log for issue 2242381.
2009-11-08 22:58:34 -08:00
Daisuke Miyakawa
0e983864fc Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
"AGENT" line.

Internal Issue number: 2247192
2009-11-09 15:34:55 +09:00
Grace Kloba
8c92c39b85 Add postdata identifier so that if we cache the post
result, we will use (url+postIdentifier) as the key
for the CacheResult.

Fix http://b/issue?id=1980031
2009-11-08 19:01:55 -08:00
Android (Google) Code Review
df0ce74126 Merge change I8c0747cf into eclair-mr2
* changes:
  Make vCard parser invalid lines in vCard file which look like some comment.
2009-11-08 18:34:23 -08:00
Android (Google) Code Review
644693f4ca Merge change Ic42763b1 into eclair
* changes:
  Fix issue #2242440: Window screen brightness attribute is broken
2009-11-08 18:07:14 -08:00
Dianne Hackborn
badc47ecd1 Fix issue #2242440: Window screen brightness attribute is broken
Um okay, that was dumb.  And I guess this means it is time to make 6.xml.

Change-Id: Ic42763b1c8a13448cf6db20b4cd6daadc7786ac1
2009-11-08 17:37:50 -08:00
Mike Lockwood
ba8eb1efef Use SystemClock.elapsedRealtime() instead of sensor timestamp
when processing light and proximity events.
This should fix loss of 2 second hysterisis for light sensor (b/2243521)

Change-Id: Ia3ce331e67d803eb5e51810cb7161b7c528312d7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-08 19:31:18 -05:00
Android (Google) Code Review
17479ebe90 Merge change I1bc566a1 into eclair
* changes:
  Ignore the light sensor if the screen is turning off.
2009-11-08 15:51:02 -08:00
Mike Lockwood
497087e33d Ignore the light sensor if the screen is turning off.
Fixes bug b/2202165.  The light sensor was interfering with the screen off animation.

Change-Id: I1bc566a164af689b60b066e6cb3dcbf7959bc50a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-08 18:43:12 -05:00
Christopher Tate
1dacdd4828 Reset binder service threads' cgroup/priority after command completion
To prevent buggy command implementations from poisoning binder threads'
scheduling class & priority for future command execution, we now reset the
cgroup and thread priority to foreground/normal when a binder service thread
finishes executing the designated command.

Change-Id: Ibc0ab2485751453f6dc96fdb4eb877fd02796e3f
2009-11-08 14:29:02 -08:00
Jeff Sharkey
06dc03f2cf Let RemoteViews nest children, allow ViewFlipper.
This change allows applications to nest children RemoteViews
inside an existing set of RemoteViews.  These nested views
are inflated and treated as addView() calls.

This change also allows ViewFlipper through RemoteViews, and
adds logic surpress flipping when the parent window is
detached or behind the lockscreen.

Fixes http://b/2239905
2009-11-08 14:14:40 -08:00
Android Code Review
4d88cbd98e Merge change Ia01d5fe8
* changes:
  Fix documentation example, per issue 895 on android.googlecode.com
2009-11-08 12:33:19 -08:00
Android (Google) Code Review
3f857b78fc Merge change I32d41651 into eclair
* changes:
  Allow a GLThread to release and reacquire the EGL Surface as needed.
2009-11-08 10:19:59 -08:00
Jack Palevich
32d4165184 Allow a GLThread to release and reacquire the EGL Surface as needed.
We currently only allow one GLThread to have an active EGL Surface at a
time.(This may be lifted in the future, when EGL and GL are reentrant.)

Prior to this change we would enforce this rule by having older GLThreads
quit when a new GLThread started. That had the drawback of leaving the
older GLSurfaceViews in a zombie state -- their GLThreads would be
gone.

We now enforce this rule by just releasing and reacquiring the EGL surface
context as needed.

Specific changes to the code:

created private helper methods - startEgl and stopEgl to help manage
starting and stopping EGL.

Move the calls to sGLThreadManager start and end from the outermost run
method into the startEgl / stopEgl methods.

Reworked the wait loop to handle starting and stopping EGL as needed.

needToWait() gets simpler -- just looks at current status.

sGLThreadManager.shouldQuit was replaced by shouldHaveEgl.


This is another step in fixing bug 2228262.
2009-11-08 10:55:56 +08:00
Android (Google) Code Review
96fce6e112 Merge change I62704736 into eclair
* changes:
  Do not apply light sensor debounce logic while the light sensor is still warming up.
2009-11-07 18:11:06 -08:00
Mike Lockwood
20ee6f2dd3 Do not apply light sensor debounce logic while the light sensor is still warming up.
This allows us to adjust immediately when we receive a correct light sensor reading
after the screen turns on.

Change-Id: I627047365640761727348e577c9164a6d6be2772
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-07 20:33:47 -05:00
Grace Kloba
62c5183a66 am f7dec4a7: am d9e22ed8: am 0691ad50: Remove "@hide pending API council" in webkit to expose the apis to SDK.
Merge commit 'f7dec4a7986c8d4034d9b029b315bfef4f73158e'

* commit 'f7dec4a7986c8d4034d9b029b315bfef4f73158e':
  Remove "@hide pending API council" in webkit to expose
2009-11-07 11:18:15 -08:00
Charles Mendis
1d65f4d4c1 am 2689808c: am 704af39c: am 638d8653: Merge change I47ef4266 into eclair
Merge commit '2689808c79d16826dbd3596183fae03c788fb130'

* commit '2689808c79d16826dbd3596183fae03c788fb130':
  Expose WallpaperSettingsActivity in the public API.
2009-11-07 11:18:00 -08:00