Commit Graph

5945 Commits

Author SHA1 Message Date
Android (Google) Code Review
e063590433 Merge change I5235cf3f into eclair
* changes:
  Fix but processing raster state pragma. rename stateFragmentStore to stateStore
2009-09-28 21:34:37 -04:00
Android (Google) Code Review
bd8832c721 Merge change Ie1072f12 into eclair
* changes:
  Finish off java API to allow fading scrollbars
2009-09-28 21:33:19 -04:00
Android (Google) Code Review
2cdd8cf76b Merge changes I82c78b83,I54f72d9d into eclair
* changes:
  Don't ask for pbuffer support, because we don't use any pbuffers.
  Print out EGL configuration info for the config we've chosen.
2009-09-28 21:32:47 -04:00
Jeff Sharkey
e711d60e70 am 8f76734d: Fix docs breakage.
Merge commit '8f76734d1e9a21618ad9762c0716ee93f60902ec' into eclair-plus-aosp

* commit '8f76734d1e9a21618ad9762c0716ee93f60902ec':
  Fix docs breakage.
2009-09-28 18:29:00 -07:00
Jack Palevich
38d3c2a850 Don't ask for pbuffer support, because we don't use any pbuffers. 2009-09-28 18:28:07 -07:00
Jack Palevich
34329eed2c Print out EGL configuration info for the config we've chosen.
Don't ask for PBuffer support, since we don't actually use pbuffers,
and some drivers might not support them.
2009-09-28 18:22:01 -07:00
Jeff Sharkey
950bf99336 am ff18bbf8: Separate API for vCards through openAssetFileDescriptor().
Merge commit 'ff18bbf83562b8a827a37c19cdc27e520786119e' into eclair-plus-aosp

* commit 'ff18bbf83562b8a827a37c19cdc27e520786119e':
  Separate API for vCards through openAssetFileDescriptor().
2009-09-28 17:54:46 -07:00
Dmitri Plotnikov
41d97de727 am 13a90abc: Adding status update attribution to ContactHeaderWidget
Merge commit '13a90abcae224b85d128ded8e59398a3fc1ce4e1' into eclair-plus-aosp

* commit '13a90abcae224b85d128ded8e59398a3fc1ce4e1':
  Adding status update attribution to ContactHeaderWidget
2009-09-28 17:54:40 -07:00
Evan Millar
083542bfca am 6e98f7e3: Merge change Ie6a95736 into eclair
Merge commit '6e98f7e3fb12b830413aa57623712b5fa3f334e3' into eclair-plus-aosp

* commit '6e98f7e3fb12b830413aa57623712b5fa3f334e3':
  Fix artifact in tab drawing.
2009-09-28 17:54:33 -07:00
Android (Google) Code Review
73e23fff55 Merge change Ie6a95736 into eclair
* changes:
  Fix artifact in tab drawing.
2009-09-28 20:15:44 -04:00
Jeff Hamilton
0a8230cae7 am f36a2bb5: Merge change Ibeb22f37 into eclair
Merge commit 'f36a2bb59b846545946124124d3290bd3eec44f0' into eclair-plus-aosp

* commit 'f36a2bb59b846545946124124d3290bd3eec44f0':
  Call the proper variant of markAsContacted.
2009-09-28 17:14:28 -07:00
Mark Wagner
cf4f764084 am 1cff7476: Merge change Ie7d26695 into eclair
Merge commit '1cff74761798eba8349a3b9824ae4b11072c11d1' into eclair-plus-aosp

* commit '1cff74761798eba8349a3b9824ae4b11072c11d1':
  Modify the "active chats" uri to not overlap with other uris.
2009-09-28 17:14:21 -07:00
Android (Google) Code Review
325aa3c23e Merge change Ibeb22f37 into eclair
* changes:
  Call the proper variant of markAsContacted.
2009-09-28 20:09:57 -04:00
Android (Google) Code Review
5e5cde174a Merge change Ie7d26695 into eclair
* changes:
  Modify the "active chats" uri to not overlap with other uris.
2009-09-28 20:05:55 -04:00
Daisuke Miyakawa
fa61a4bc4f am 3f48d31b: Merge change I228d52db into eclair
Merge commit '3f48d31b747a3c5addc1f9d2e737b36e1f70a2d3' into eclair-plus-aosp

* commit '3f48d31b747a3c5addc1f9d2e737b36e1f70a2d3':
  Three changes.
2009-09-28 16:54:12 -07:00
Android (Google) Code Review
110cffcc3b Merge change I228d52db into eclair
* changes:
  Three changes.
2009-09-28 19:47:28 -04:00
Jack Palevich
21885d9414 am ee25eb58: Merge change I669ce246 into eclair
Merge commit 'ee25eb58aac8fded3927c0343eaa367f66c8b79d' into eclair-plus-aosp

* commit 'ee25eb58aac8fded3927c0343eaa367f66c8b79d':
  Print out all available EGL configurations.
2009-09-28 16:44:32 -07:00
Android (Google) Code Review
bbff7e07e0 Merge change I669ce246 into eclair
* changes:
  Print out all available EGL configurations.
2009-09-28 19:35:43 -04:00
Jack Palevich
d9872bf424 Print out all available EGL configurations. 2009-09-28 16:34:45 -07:00
Romain Guy
d464aea49c am 5d259d3b: Merge change Id29ec50d into eclair
Merge commit '5d259d3bfd4ea79b8cb3e5aeeb3768f769e48a35' into eclair-plus-aosp

* commit '5d259d3bfd4ea79b8cb3e5aeeb3768f769e48a35':
  Do not crash appwdiget host when a pending intent send fails.
2009-09-28 16:28:42 -07:00
Mike Lockwood
9e8930b300 am 733fdf34: Disable keyguard while docked when the lock screen is insecure.
Merge commit '733fdf34b6a8a8e3983ff7663828a928d3c19944' into eclair-plus-aosp

* commit '733fdf34b6a8a8e3983ff7663828a928d3c19944':
  Disable keyguard while docked when the lock screen is insecure.
2009-09-28 16:28:36 -07:00
Android (Google) Code Review
760d1466f3 Merge change Id29ec50d into eclair
* changes:
  Do not crash appwdiget host when a pending intent send fails.
2009-09-28 19:25:53 -04:00
Tadashi G. Takaoka
d62df101de am c031981f: Merge change I36ad03e1 into eclair
Merge commit 'c031981f2320aa592aa819f4b0a22d0da6e7d5e4' into eclair-plus-aosp

* commit 'c031981f2320aa592aa819f4b0a22d0da6e7d5e4':
  Delegate exclude mimetypes to FasttrackBadgeWidget
2009-09-28 16:08:31 -07:00
Android (Google) Code Review
6e583a6350 Merge change I36ad03e1 into eclair
* changes:
  Delegate exclude mimetypes to FasttrackBadgeWidget
2009-09-28 19:03:04 -04:00
Dianne Hackborn
5e0efca211 am ebd45e5c: Merge change I55edce63 into eclair
Merge commit 'ebd45e5ca9690110ecb50c26b0b791054ee4c0ef' into eclair-plus-aosp

* commit 'ebd45e5ca9690110ecb50c26b0b791054ee4c0ef':
  Fix issue #2149145: Safe Mode does not work on Sholes device
2009-09-28 15:18:51 -07:00
Android (Google) Code Review
63b97ecd13 Merge change I55edce63 into eclair
* changes:
  Fix issue #2149145: Safe Mode does not work on Sholes device
2009-09-28 18:11:28 -04:00
Mike Cleron
af7d739d46 am fe81d386: Remove obsolete links; start at a method to turn on fading scrollbars
Merge commit 'fe81d386a818b386ffc0d5a789236531ab4e264f' into eclair-plus-aosp

* commit 'fe81d386a818b386ffc0d5a789236531ab4e264f':
  Remove obsolete links; start at a method to turn on fading scrollbars
2009-09-28 14:41:46 -07:00
Wu-cheng Li
4dac1f419f am fe1a86df: Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
Merge commit 'fe1a86df8b1c23e3290f96dce69984bf979a462b' into eclair-plus-aosp

* commit 'fe1a86df8b1c23e3290f96dce69984bf979a462b':
  Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
2009-09-28 14:13:11 -07:00
Xavier Ducrohet
e8ecd48313 am 279ba943: Merge change I7c7b1596 into eclair
Merge commit '279ba943553ec2368d14e1b3c8a88c36bf17785d' into eclair-plus-aosp

* commit '279ba943553ec2368d14e1b3c8a88c36bf17785d':
  Fix a warning output.
2009-09-28 13:55:36 -07:00
Romain Guy
821603c1f1 am b4c547a5: Fix possible NPE in AbsListView.positionSelector().
Merge commit 'b4c547a56caebb5900c132ec9d5ce953f89de14f' into eclair-plus-aosp

* commit 'b4c547a56caebb5900c132ec9d5ce953f89de14f':
  Fix possible NPE in AbsListView.positionSelector().
2009-09-28 13:55:30 -07:00
Wu-cheng Li
eb16a09f59 Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH. 2009-09-28 13:51:59 -07:00
Android (Google) Code Review
b2eccea36e Merge change I7c7b1596 into eclair
* changes:
  Fix a warning output.
2009-09-28 16:49:16 -04:00
Nick Pelly
8f637347f5 am aef439e6: Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
Merge commit 'aef439e6f825c0cb99a2ac08c8207f48b7a9fe10' into eclair-plus-aosp

* commit 'aef439e6f825c0cb99a2ac08c8207f48b7a9fe10':
  Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
2009-09-28 13:19:15 -07:00
Bjorn Bringert
d4ed8958a0 am 2dfa6edc: Merge change Ida50e915 into eclair
Merge commit '2dfa6edcd086bb9ce4fbb3b979f3afec93f6cddc' into eclair-plus-aosp

* commit '2dfa6edcd086bb9ce4fbb3b979f3afec93f6cddc':
  Pass limit=50 to all suggestion sources.
2009-09-28 12:54:37 -07:00
Android (Google) Code Review
4bd45349e4 Merge change Ida50e915 into eclair
* changes:
  Pass limit=50 to all suggestion sources.
2009-09-28 15:47:56 -04:00
Bjorn Bringert
75f87e7422 am 9d686c93: Merge change 27474 into eclair
Merge commit '9d686c9384cad2bccb3db27eb19bb089bf05041c' into eclair-plus-aosp

* commit '9d686c9384cad2bccb3db27eb19bb089bf05041c':
  Don't crash search when getKeyDispatcherState() is null
2009-09-28 11:49:43 -07:00
Mike Cleron
b79b874a63 am 3ecd58c6: Fix build
Merge commit '3ecd58c650371206008efd687933c370e4e28a34' into eclair-plus-aosp

* commit '3ecd58c650371206008efd687933c370e4e28a34':
  Fix build
2009-09-28 11:49:36 -07:00
Evan Millar
a4c79e1168 am 14f65ff9: Merge change 27243 into eclair
Merge commit '14f65ff9451747d6bb802e1b754afae1110ad759' into eclair-plus-aosp

* commit '14f65ff9451747d6bb802e1b754afae1110ad759':
  Add drop shadow to contact name in ContactHeaderWidget
2009-09-28 11:49:29 -07:00
James Dong
09f69b715e am 99638e74: Merge change 27466 into eclair
Merge commit '99638e747251929191f7773d2a81bbea223f1e09' into eclair-plus-aosp

* commit '99638e747251929191f7773d2a81bbea223f1e09':
  Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 11:49:22 -07:00
Android (Google) Code Review
d83a6d25f8 Merge change 27474 into eclair
* changes:
  Don't crash search when getKeyDispatcherState() is null
2009-09-28 14:46:43 -04:00
Android (Google) Code Review
ed44a047c0 Merge change 27243 into eclair
* changes:
  Add drop shadow to contact name in ContactHeaderWidget
2009-09-28 14:44:42 -04:00
Android (Google) Code Review
bc3a0fed68 Merge change 27466 into eclair
* changes:
  Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 14:40:34 -04:00
Amith Yamasani
f3833e5db8 am fedb3269: Merge change 27349 into eclair
Merge commit 'fedb32696ace93afeefa216b2a5e90b2793ec85f' into eclair-plus-aosp

* commit 'fedb32696ace93afeefa216b2a5e90b2793ec85f':
  Fix 2143297: Fix transition from password -> visible password
2009-09-28 11:16:53 -07:00
Nick Pelly
2574142eb9 am 96e42b3a: Merge change 27462 into eclair
Merge commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce' into eclair-plus-aosp

* commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce':
  Add an API to request a system activity to turn on Bluetooth.
2009-09-28 11:16:45 -07:00
Android (Google) Code Review
1c0dcf0445 Merge change 27349 into eclair
* changes:
  Fix 2143297: Fix transition from password -> visible password
2009-09-28 14:12:03 -04:00
Android (Google) Code Review
f52224afea Merge change 27462 into eclair
* changes:
  Add an API to request a system activity to turn on Bluetooth.
2009-09-28 14:09:47 -04:00
Mike Cleron
161b537312 am f116bf88: Fading scrollbars return. But you have to opt in.
Merge commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9' into eclair-plus-aosp

* commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9':
  Fading scrollbars return. But you have to opt in.
2009-09-28 11:07:14 -07:00
Andrei Popescu
55312676c0 am 5d062bc3: Merge change 27426 into eclair
Merge commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c' into eclair-plus-aosp

* commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c':
  Handle the case where GoogleLocationSettingObserver::onChange
2009-09-28 10:42:13 -07:00
Android (Google) Code Review
029f39b5c9 Merge change 27426 into eclair
* changes:
  Handle the case where GoogleLocationSettingObserver::onChange is called after GoogleLocationSettingObserver::doNotObserve().
2009-09-28 13:33:01 -04:00
Grace Kloba
0783b7e05f am 0d03b914: Before we send VIEW_SIZE_CHANGED after first layout, we should remove VIEW_SIZE_CHANGED in the queue if there is any as we are going to send the message in the front of the queue.
Merge commit '0d03b91407aecab52d0fe8b6f849a0398878a2c1' into eclair-plus-aosp

* commit '0d03b91407aecab52d0fe8b6f849a0398878a2c1':
  Before we send VIEW_SIZE_CHANGED after first layout,
2009-09-28 10:15:00 -07:00