Commit Graph

5729 Commits

Author SHA1 Message Date
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
Suchi Amalapurapu
656f1bdf67 am fee73ee2: Merge change 27411 into eclair
Merge commit 'fee73ee2d6eb3e875e39a64c410d6a1ff8508ad3' into eclair-plus-aosp

* commit 'fee73ee2d6eb3e875e39a64c410d6a1ff8508ad3':
  Cache inflated view to avoid inflation of layouts in preferences
2009-09-28 10:14:53 -07:00
Guang Zhu
29258177c7 am 1cdb55aa: Merge change 27457 into eclair
Merge commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5' into eclair-plus-aosp

* commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5':
  Added code style fix that actually did not get submitted in 2nd patch of previous change.
2009-09-28 10:14:47 -07:00
Android (Google) Code Review
a61e88f472 Merge change 27411 into eclair
* changes:
  Cache inflated view to avoid inflation of layouts in preferences If layout id is specified for a Preference object, convertView is set to null in its adapter which results in inflation of Preference view in getView each time the Preference object is laid out on the screen. Just use an instance variable to cache the inflated view nulling it whenever the layout changes and use it in initing the convertView in getView.
2009-09-28 13:07:16 -04:00
Android (Google) Code Review
04140fa163 Merge change 27457 into eclair
* changes:
  Added code style fix that actually did not get submitted in 2nd patch of previous change.
2009-09-28 12:56:02 -04:00
Grace Kloba
1ad283c10a am 207308a7: WebView may get message after destroy() is called. Just return in this case.
Merge commit '207308a781621c427acccbd9983c2511a65e9137' into eclair-plus-aosp

* commit '207308a781621c427acccbd9983c2511a65e9137':
  WebView may get message after destroy() is called.
2009-09-28 09:49:53 -07:00
Andrew Stadler
35aa3fe1a9 am 3fd2a81e: Merge change 27410 into eclair
Merge commit '3fd2a81ec174f226c0b889e2679dd54e3c086d1c' into eclair-plus-aosp

* commit '3fd2a81ec174f226c0b889e2679dd54e3c086d1c':
  Add extension->mime type mappings
2009-09-28 09:49:46 -07:00
Android (Google) Code Review
8bcb650279 Merge change 27410 into eclair
* changes:
  Add extension->mime type mappings
2009-09-28 12:27:45 -04:00
Marco Nelissen
710f854ff6 am 7d973514: Merge change 27449 into eclair
Merge commit '7d9735142f75c3bf30b420fdd006dc356f32fede' into eclair-plus-aosp

* commit '7d9735142f75c3bf30b420fdd006dc356f32fede':
  Always consider m4a files as audio, even when they contain a video track.
2009-09-28 09:27:10 -07:00
Guang Zhu
62d798068a am c18b0ebc: Merge change 27185 into eclair
Merge commit 'c18b0ebcfb905cc5001618c78890e884a859e069' into eclair-plus-aosp

* commit 'c18b0ebcfb905cc5001618c78890e884a859e069':
  Add checks for double-dumping on webkit data.
2009-09-28 09:27:04 -07:00
Android (Google) Code Review
d6b20b12f5 Merge change 27449 into eclair
* changes:
  Always consider m4a files as audio, even when they contain a video track.
2009-09-28 12:24:08 -04:00
Android (Google) Code Review
f09a8c09d9 Merge change 27185 into eclair
* changes:
  Add checks for double-dumping on webkit data.
2009-09-28 12:21:30 -04:00
Daniel Sandler
b2fab923cf am b19774d5: Updated status bar graphics (drop date 9/25/09).
Merge commit 'b19774d520bde5bb12d80417788d9a773e123c14' into eclair-plus-aosp

* commit 'b19774d520bde5bb12d80417788d9a773e123c14':
  Updated status bar graphics (drop date 9/25/09).
2009-09-28 07:46:20 -07:00
Mathias Agopian
1058ea6040 am 81384bf9: don\'t emit GL commands when sf is in freeze mode
Merge commit '81384bf927c47a4efa653b14273084a13e67e3ac' into eclair-plus-aosp

* commit '81384bf927c47a4efa653b14273084a13e67e3ac':
  don't emit GL commands when sf is in freeze mode
2009-09-27 23:06:42 -07:00
Mathias Agopian
8a77baaa11 don't emit GL commands when sf is in freeze mode
We were emitting GL commands, calling composition complete and releasing clients
without ever calling eglSwapBuffers(), which is completely wrong on non-direct
renders. This could cause transient drawing artifacts when unfreezing the
screen (upon orientaion change for instance) and could also block the clients
for ever as they are waiting for their previous buffer to be rendered.
2009-09-27 22:47:32 -07:00
Mathias Agopian
04e40d97b2 am 1a3c8950: Merge change 27387 into eclair
Merge commit '1a3c8950394b98f6f354456830208d70e87b8bb6' into eclair-plus-aosp

* commit '1a3c8950394b98f6f354456830208d70e87b8bb6':
  fix [2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT
2009-09-27 20:23:55 -07:00
Dmitri Plotnikov
23c06eb0d5 am a60479d2: Fixing broken javadoc.
Merge commit 'a60479d2ea7857455ebad6c56e357d00b0492364' into eclair-plus-aosp

* commit 'a60479d2ea7857455ebad6c56e357d00b0492364':
  Fixing broken javadoc.
2009-09-27 20:23:49 -07:00