13761 Commits

Author SHA1 Message Date
Marco Nelissen
430785f66d am eac4222f: am 949ffa3d: am 11cff8cd: Merge change Ie211adae into eclair
Merge commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4'

* commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4':
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:42:13 -08:00
Marco Nelissen
eac4222f7f am 949ffa3d: am 11cff8cd: Merge change Ie211adae into eclair
Merge commit '949ffa3da5231772425c3bde50caeab6c4d08ec5' into eclair-mr2-plus-aosp

* commit '949ffa3da5231772425c3bde50caeab6c4d08ec5':
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:38:31 -08:00
Marco Nelissen
949ffa3da5 am 11cff8cd: Merge change Ie211adae into eclair
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-mr2

* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:34:42 -08:00
Android (Google) Code Review
11cff8cd30 Merge change Ie211adae into eclair
* changes:
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:31:02 -08:00
Dave Sparks
4180420499 am 5a39e583: am 29b1e0b1: am 0c845661: Add new ringtone package. Bug 2219950.
Merge commit '5a39e5831d8ef19c6bb46d5337f4f5503deca3fd'

* commit '5a39e5831d8ef19c6bb46d5337f4f5503deca3fd':
  Add new ringtone package. Bug 2219950.
2009-11-09 19:11:03 -08:00
Dave Sparks
4c03f37e52 am 32c4c679: am 19add066: am bb0db626: Merge change I2a4b120c into eclair
Merge commit '32c4c679708e8ad2f7f7c76462c3e5fa43d135db'

* commit '32c4c679708e8ad2f7f7c76462c3e5fa43d135db':
  Add more ringtones. Bug 2219950.
2009-11-09 19:10:52 -08:00
Dave Sparks
5a39e5831d am 29b1e0b1: am 0c845661: Add new ringtone package. Bug 2219950.
Merge commit '29b1e0b173a1ed33c5d2ca6c2ee15b4bd4974085' into eclair-mr2-plus-aosp

* commit '29b1e0b173a1ed33c5d2ca6c2ee15b4bd4974085':
  Add new ringtone package. Bug 2219950.
2009-11-09 19:08:38 -08:00
Dave Sparks
32c4c67970 am 19add066: am bb0db626: Merge change I2a4b120c into eclair
Merge commit '19add066cc637301c3e1523825937d073feb416e' into eclair-mr2-plus-aosp

* commit '19add066cc637301c3e1523825937d073feb416e':
  Add more ringtones. Bug 2219950.
2009-11-09 19:08:29 -08:00
Dave Sparks
29b1e0b173 am 0c845661: Add new ringtone package. Bug 2219950.
Merge commit '0c845661c54bac56910706b1fc0d88288b954890' into eclair-mr2

* commit '0c845661c54bac56910706b1fc0d88288b954890':
  Add new ringtone package. Bug 2219950.
2009-11-09 19:05:30 -08:00
Dave Sparks
19add066cc am bb0db626: Merge change I2a4b120c into eclair
Merge commit 'bb0db6267851b923a8370355c68adfc3bb30108d' into eclair-mr2

* commit 'bb0db6267851b923a8370355c68adfc3bb30108d':
  Add more ringtones. Bug 2219950.
2009-11-09 19:05:20 -08:00
Dave Sparks
0c845661c5 Add new ringtone package. Bug 2219950. 2009-11-09 19:02:33 -08:00
Android (Google) Code Review
bb0db62678 Merge change I2a4b120c into eclair
* changes:
  Add more ringtones. Bug 2219950.
2009-11-09 19:02:17 -08:00
Marco Nelissen
bf6956b1d9 Add a way for wallpapers to know the delta between virtual screens. 2009-11-09 17:39:33 -08:00
Xavier Ducrohet
75cec67e3a am 3969e50a: am aa10b9fb: am e6ab011b: Merge change Ib12bcb7f into eclair
Merge commit '3969e50a2872014e459b802e2e654b901eecc574'

* commit '3969e50a2872014e459b802e2e654b901eecc574':
  Support for fallback fonts in layoutlib.
2009-11-09 17:04:10 -08:00
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
Dave Sparks
42acab9751 Add more ringtones. Bug 2219950. 2009-11-09 16:58:14 -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
92885e0328 am 9e0da5bd: am 452a5296: Merge change I319bf9ee into eclair-mr2
Merge commit '9e0da5bd2d40b33d7de8897aa5e95a06d42fd990'

* commit '9e0da5bd2d40b33d7de8897aa5e95a06d42fd990':
  Make vCard exporter check invalid phone numbers and re-format them if needed.
2009-11-09 16:42:56 -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
Dave Sparks
20979c356d am 881345b8: am 61a2c04f: am 3ea2ae7d: Merge change I47aa76bf into eclair
Merge commit '881345b81e9fe2a84be2ff3240b57a72961a8720'

* commit '881345b81e9fe2a84be2ff3240b57a72961a8720':
  Add new notifications and ringtones.
2009-11-09 16:30:57 -08:00
Robert Greenwalt
665187ee72 am 69da1fe8: am feafc202: am fe225e25: Merge change I70e1f7a6 into eclair
Merge commit '69da1fe8b868437c5b3e6e4fcf07e7dc7793201d'

* commit '69da1fe8b868437c5b3e6e4fcf07e7dc7793201d':
  Fix the selection of locale from SIM mcc.
2009-11-09 16:30:45 -08:00
Eric Laurent
aaad676137 am c6aaa09b: am 756e75cf: am 090c60bb: Merge change I73b60354 into eclair
Merge commit 'c6aaa09b7075f00e2cff543b50bc84bbdd133d7b'

* commit 'c6aaa09b7075f00e2cff543b50bc84bbdd133d7b':
  AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
2009-11-09 16:30:29 -08:00
Bjorn Bringert
7ebdc03a95 am e3dc9f49: am e8341ebb: am 2bb53754: Merge change Icaf932d0 into eclair
Merge commit 'e3dc9f491a8e9f9cdc6f7815be9ece4c87ebe8a4'

* commit 'e3dc9f491a8e9f9cdc6f7815be9ece4c87ebe8a4':
  Fix code example in Parcelable javadoc
2009-11-09 16:30:18 -08:00
Eric Laurent
9731f7c96f am 43396952: am 05388e45: am 93572eef: Merge change Ifb9d6df3 into eclair
Merge commit '43396952a5b9466f18aa640f9755b6b80fa587f5'

* commit '43396952a5b9466f18aa640f9755b6b80fa587f5':
  More log for issue 2242381.
2009-11-09 16:30:05 -08:00
Dianne Hackborn
fc19a92334 am 794bfed0: am 2934bc1c: am 644693f4: Merge change Ic42763b1 into eclair
Merge commit '794bfed0b9d8fded77cf096213cfb36cf43189ba'

* commit '794bfed0b9d8fded77cf096213cfb36cf43189ba':
  Fix issue #2242440: Window screen brightness attribute is broken
2009-11-09 16:29:48 -08:00
Mike Lockwood
57e05dfffa am 6a3f9e24: am 6bfd8d2a: am ba8eb1ef: Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit '6a3f9e24b61e4da16bec7846b504c851ac7ac289'

* commit '6a3f9e24b61e4da16bec7846b504c851ac7ac289':
  Use SystemClock.elapsedRealtime() instead of sensor timestamp
2009-11-09 16:29:36 -08:00
Mike Lockwood
9f244ce752 am e59631b6: am 149f6710: am 17479ebe: Merge change I1bc566a1 into eclair
Merge commit 'e59631b601dda685cd0ad244ec502ff3bf308dc0'

* commit 'e59631b601dda685cd0ad244ec502ff3bf308dc0':
  Ignore the light sensor if the screen is turning off.
2009-11-09 16:29:23 -08:00
Christopher Tate
670fb3732f am 2c203adb: am ee9f9759: am 1dacdd48: Reset binder service threads\' cgroup/priority after command completion
Merge commit '2c203adbe6df2c0d86abf280cdc36917595fe41d'

* commit '2c203adbe6df2c0d86abf280cdc36917595fe41d':
  Reset binder service threads' cgroup/priority after command completion
2009-11-09 16:29:08 -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
Jack Palevich
2806a6b5ff am 73ae27f0: am 8da3ac92: resolved conflicts for merge of 3f857b78 to eclair-mr2
Merge commit '73ae27f0c56fa705dcfb86d784a95b86f10e48ad'

* commit '73ae27f0c56fa705dcfb86d784a95b86f10e48ad':
  Allow a GLThread to release and reacquire the EGL Surface as needed.
2009-11-09 16:14:25 -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