Commit Graph

11873 Commits

Author SHA1 Message Date
Xavier Ducrohet
3969e50a28 am aa10b9fb: am e6ab011b: Merge change Ib12bcb7f into eclair
Merge commit 'aa10b9fb52db88e3cc9045019f42fa83e9da9868' into eclair-mr2-plus-aosp

* commit 'aa10b9fb52db88e3cc9045019f42fa83e9da9868':
  Support for fallback fonts in layoutlib.
2009-11-09 17:00:33 -08:00
Xavier Ducrohet
aa10b9fb52 am e6ab011b: Merge change Ib12bcb7f into eclair
Merge commit 'e6ab011b8b8aa6c461e64cabb9b25d890d68edb1' into eclair-mr2

* commit 'e6ab011b8b8aa6c461e64cabb9b25d890d68edb1':
  Support for fallback fonts in layoutlib.
2009-11-09 16:56:53 -08:00
Android (Google) Code Review
e6ab011b8b Merge change Ib12bcb7f into eclair
* changes:
  Support for fallback fonts in layoutlib.
2009-11-09 16:52:54 -08:00
Daisuke Miyakawa
9e0da5bd2d am 452a5296: Merge change I319bf9ee into eclair-mr2
Merge commit '452a52968f43c21e9a040009e209df023a34876c' into eclair-mr2-plus-aosp

* commit '452a52968f43c21e9a040009e209df023a34876c':
  Make vCard exporter check invalid phone numbers and re-format them if needed.
2009-11-09 16:39:33 -08:00
Android (Google) Code Review
452a52968f Merge change I319bf9ee into eclair-mr2
* changes:
  Make vCard exporter check invalid phone numbers and re-format them if needed.
2009-11-09 16:35:44 -08:00
Daisuke Miyakawa
f2ad61c83d Make vCard exporter check invalid phone numbers and re-format them if needed.
Also add a unit test for the case.

Internal issue number: 2246410
2009-11-10 09:29:04 +09:00
Dave Sparks
881345b81e am 61a2c04f: am 3ea2ae7d: Merge change I47aa76bf into eclair
Merge commit '61a2c04ffedfcd963b1b8bcb310ab12b0d7e9dd4' into eclair-mr2-plus-aosp

* commit '61a2c04ffedfcd963b1b8bcb310ab12b0d7e9dd4':
  Add new notifications and ringtones.
2009-11-09 16:25:13 -08:00
Robert Greenwalt
69da1fe8b8 am feafc202: am fe225e25: Merge change I70e1f7a6 into eclair
Merge commit 'feafc202bbfd768423326aeb0faafaee3f348bb6' into eclair-mr2-plus-aosp

* commit 'feafc202bbfd768423326aeb0faafaee3f348bb6':
  Fix the selection of locale from SIM mcc.
2009-11-09 16:25:04 -08:00
Eric Laurent
c6aaa09b70 am 756e75cf: am 090c60bb: Merge change I73b60354 into eclair
Merge commit '756e75cfcfbd5b311167de9661a1e3376dd4c4db' into eclair-mr2-plus-aosp

* commit '756e75cfcfbd5b311167de9661a1e3376dd4c4db':
  AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
2009-11-09 16:24:55 -08:00
Bjorn Bringert
e3dc9f491a am e8341ebb: am 2bb53754: Merge change Icaf932d0 into eclair
Merge commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525' into eclair-mr2-plus-aosp

* commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525':
  Fix code example in Parcelable javadoc
2009-11-09 16:24:46 -08:00
Eric Laurent
43396952a5 am 05388e45: am 93572eef: Merge change Ifb9d6df3 into eclair
Merge commit '05388e454b9d5c6e3af0ca4b6d6e62f2352f6b19' into eclair-mr2-plus-aosp

* commit '05388e454b9d5c6e3af0ca4b6d6e62f2352f6b19':
  More log for issue 2242381.
2009-11-09 16:24:37 -08:00
Dianne Hackborn
794bfed0b9 am 2934bc1c: am 644693f4: Merge change Ic42763b1 into eclair
Merge commit '2934bc1c438b6f00942dcc5c18cbe7ecfa8785c0' into eclair-mr2-plus-aosp

* commit '2934bc1c438b6f00942dcc5c18cbe7ecfa8785c0':
  Fix issue #2242440: Window screen brightness attribute is broken
2009-11-09 16:24:26 -08:00
Mike Lockwood
6a3f9e24b6 am 6bfd8d2a: am ba8eb1ef: Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit '6bfd8d2a31037716f2e0964625807fc7b8e90e92' into eclair-mr2-plus-aosp

* commit '6bfd8d2a31037716f2e0964625807fc7b8e90e92':
  Use SystemClock.elapsedRealtime() instead of sensor timestamp
2009-11-09 16:24:15 -08:00
Mike Lockwood
e59631b601 am 149f6710: am 17479ebe: Merge change I1bc566a1 into eclair
Merge commit '149f6710f774f36570de7be8ffa3dd6e8194a11d' into eclair-mr2-plus-aosp

* commit '149f6710f774f36570de7be8ffa3dd6e8194a11d':
  Ignore the light sensor if the screen is turning off.
2009-11-09 16:24:04 -08:00
Christopher Tate
2c203adbe6 am ee9f9759: am 1dacdd48: Reset binder service threads\' cgroup/priority after command completion
Merge commit 'ee9f9759ba84b2a4a69d180e299511a91621f33a' into eclair-mr2-plus-aosp

* commit 'ee9f9759ba84b2a4a69d180e299511a91621f33a':
  Reset binder service threads' cgroup/priority after command completion
2009-11-09 16:23:53 -08:00
Dave Sparks
61a2c04ffe am 3ea2ae7d: Merge change I47aa76bf into eclair
Merge commit '3ea2ae7d6f8a73947831c15f970de70730c5a0f6' into eclair-mr2

* commit '3ea2ae7d6f8a73947831c15f970de70730c5a0f6':
  Add new notifications and ringtones.
2009-11-09 16:17:56 -08:00
Robert Greenwalt
feafc202bb am fe225e25: Merge change I70e1f7a6 into eclair
Merge commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837' into eclair-mr2

* commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837':
  Fix the selection of locale from SIM mcc.
2009-11-09 16:17:30 -08:00
Eric Laurent
756e75cfcf am 090c60bb: Merge change I73b60354 into eclair
Merge commit '090c60bb9d6608df4a8d753fc91974fe2c49c262' into eclair-mr2

* commit '090c60bb9d6608df4a8d753fc91974fe2c49c262':
  AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
2009-11-09 16:15:15 -08:00
Bjorn Bringert
e8341ebbc6 am 2bb53754: Merge change Icaf932d0 into eclair
Merge commit '2bb53754337225508f2b4d12f1575df7c226100c' into eclair-mr2

* commit '2bb53754337225508f2b4d12f1575df7c226100c':
  Fix code example in Parcelable javadoc
2009-11-09 16:15:05 -08:00
Eric Laurent
05388e454b am 93572eef: Merge change Ifb9d6df3 into eclair
Merge commit '93572eef41f94f023037482f194db0ab07d0c33a' into eclair-mr2

* commit '93572eef41f94f023037482f194db0ab07d0c33a':
  More log for issue 2242381.
2009-11-09 16:14:55 -08:00
Dianne Hackborn
2934bc1c43 am 644693f4: Merge change Ic42763b1 into eclair
Merge commit '644693f4caf2364a0e811dca13304788e2c8fee8' into eclair-mr2

* commit '644693f4caf2364a0e811dca13304788e2c8fee8':
  Fix issue #2242440: Window screen brightness attribute is broken
2009-11-09 16:14:38 -08:00
Mike Lockwood
6bfd8d2a31 am ba8eb1ef: Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f' into eclair-mr2

* commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f':
  Use SystemClock.elapsedRealtime() instead of sensor timestamp
2009-11-09 16:14:26 -08:00
Mike Lockwood
149f6710f7 am 17479ebe: Merge change I1bc566a1 into eclair
Merge commit '17479ebe90a5ebd17ee386b8fd83256765afce0b' into eclair-mr2

* commit '17479ebe90a5ebd17ee386b8fd83256765afce0b':
  Ignore the light sensor if the screen is turning off.
2009-11-09 16:14:14 -08:00
Christopher Tate
ee9f9759ba am 1dacdd48: Reset binder service threads\' cgroup/priority after command completion
Merge commit '1dacdd482894bee9fbc1993cbb525fb800750222' into eclair-mr2

* commit '1dacdd482894bee9fbc1993cbb525fb800750222':
  Reset binder service threads' cgroup/priority after command completion
2009-11-09 16:14:02 -08:00
Jack Palevich
73ae27f0c5 am 8da3ac92: resolved conflicts for merge of 3f857b78 to eclair-mr2
Merge commit '8da3ac92a6a6247ef06de4d4b684f8635d8fc003' into eclair-mr2-plus-aosp

* commit '8da3ac92a6a6247ef06de4d4b684f8635d8fc003':
  Allow a GLThread to release and reacquire the EGL Surface as needed.
2009-11-09 16:11:11 -08:00
Jack Palevich
8da3ac92a6 resolved conflicts for merge of 3f857b78 to eclair-mr2 2009-11-10 08:04:53 +08:00
Xavier Ducrohet
9a4593ffcc Support for fallback fonts in layoutlib.
BUG 2041229

Change-Id: Ib12bcb7f6d8f0e4c2b51871f8129ecf51fa938ee
2009-11-09 14:55:08 -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
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
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