Commit Graph

6988 Commits

Author SHA1 Message Date
Scott Main
e01228baf7 am 2a6a149f: am 820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '2a6a149fc2abfb8ef654ed36ce4524209f5e33bc' into eclair-plus-aosp

* commit '2a6a149fc2abfb8ef654ed36ce4524209f5e33bc':
  docs change for ESD: add samples html pages for offline docs
2009-11-20 10:02:10 -08:00
Scott Main
459cb2a072 am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit 'e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-plus-aosp

* commit 'e16113998bb10f39ee1384bfc497aceeeb193440':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 10:01:35 -08:00
Scott Main
35f28c7d40 am 820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '820a4e7dd6adeff162a92ca40ebe2f109561036b' into eclair

* commit '820a4e7dd6adeff162a92ca40ebe2f109561036b':
  docs change for ESD: add samples html pages for offline docs
2009-11-20 09:54:52 -08:00
Scott Main
e6102458d5 am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair

* commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 09:54:22 -08:00
Joe Onorato
eb52e69486 am 57bda83d: Merge change I4f614c9e into eclair
Merge commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870' into eclair-plus-aosp

* commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870':
  Add a test app that has 100 icons.  None of them do anything when clicked.
2009-11-19 20:21:46 -08:00
Android (Google) Code Review
716534ba06 Merge change I4f614c9e into eclair
* changes:
  Add a test app that has 100 icons.  None of them do anything when clicked.
2009-11-19 20:17:06 -08:00
Mathias Agopian
935b3deec9 am 13feccf5: Merge change I39f0003e into eclair
Merge commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae' into eclair-plus-aosp

* commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae':
  fix [2235414] libagl glDeleteBuffers() crashes
2009-11-19 19:07:17 -08:00
Android (Google) Code Review
1a1ce3a6a2 Merge change I39f0003e into eclair
* changes:
  fix [2235414] libagl glDeleteBuffers() crashes
2009-11-19 19:03:53 -08:00
Dianne Hackborn
af86e2aa3f am 524812fb: Merge change I7d40ad9a into eclair
Merge commit '524812fbf583db5053ff56f7a146fa8fe9296742' into eclair-plus-aosp

* commit '524812fbf583db5053ff56f7a146fa8fe9296742':
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:05:06 -08:00
Android (Google) Code Review
5855937862 Merge change I7d40ad9a into eclair
* changes:
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:01:30 -08:00
Mathias Agopian
a750fc0bf8 fix [2235414] libagl glDeleteBuffers() crashes
don't dereference null pointers, would happen if one of the array wasn't bound.
2009-11-19 17:32:05 -08:00
Mathias Agopian
eca97f6e79 am 23aa34a7: Merge change I137dac6f into eclair
Merge commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a' into eclair-plus-aosp

* commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a':
  backout a workaround that is not needed anymore
2009-11-19 16:29:24 -08:00
Mike Chan
d207811dda am 23b3ef82: Merge change I99194df1 into eclair
Merge commit '23b3ef82c0c4175e8c953740306ee6b080dae8e7' into eclair-plus-aosp

* commit '23b3ef82c0c4175e8c953740306ee6b080dae8e7':
  frameworks: base: dumpstate: Dump kernel cpufreq speeds.
2009-11-19 16:23:35 -08:00
Android (Google) Code Review
66112b114d Merge change I137dac6f into eclair
* changes:
  backout a workaround that is not needed anymore
2009-11-19 16:23:29 -08:00
Android (Google) Code Review
3250af908d Merge change I99194df1 into eclair
* changes:
  frameworks: base: dumpstate: Dump kernel cpufreq speeds.
2009-11-19 16:18:51 -08:00
Mathias Agopian
60f5d3694b backout a workaround that is not needed anymore
we had to add a call to glFinish() before glReadPixels() because of a bug in the GL ES
driver of a certain device. This is not needed anymore.
2009-11-19 15:52:28 -08:00
Mathias Agopian
e472f6ba43 am 74a331b5: Merge change I4c29c948 into eclair
Merge commit '74a331b5dd1d39da44b608743c36ab3523f598d2' into eclair-plus-aosp

* commit '74a331b5dd1d39da44b608743c36ab3523f598d2':
  fix [2269022] The raw picture displayed post shutter seems to have low-resolution
2009-11-19 15:47:20 -08:00
Android (Google) Code Review
48d2c6051e Merge change I4c29c948 into eclair
* changes:
  fix [2269022] The raw picture displayed post shutter seems to have low-resolution
2009-11-19 15:44:13 -08:00
Andreas Huber
617b9f5e88 am f854e077: Merge change I8134d6ed into eclair
Merge commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-plus-aosp

* commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4':
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
2009-11-19 15:01:45 -08:00
Jason Sams
d283d62bdd am ddac83a5: Fix extended logging for object dumping.
Merge commit 'ddac83a516e939b55f20b226365596760159c9df' into eclair-plus-aosp

* commit 'ddac83a516e939b55f20b226365596760159c9df':
  Fix extended logging for object dumping.
2009-11-19 14:57:17 -08:00
Android (Google) Code Review
ae5f30aed3 Merge change I8134d6ed into eclair
* changes:
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
2009-11-19 14:52:57 -08:00
Mathias Agopian
713795a2e0 fix [2269022] The raw picture displayed post shutter seems to have low-resolution
Make sure to always enable linear filtering in LayerBuffer. This change doesn't affect
devices using overlays.
2009-11-19 14:46:26 -08:00
Fred Quintana
53d766708d am 5994cd28: -hide AccountManagerResponse, which never should have been exposed in the first place
Merge commit '5994cd2898ad3c76d1f5068137a884024f521163' into eclair-plus-aosp

* commit '5994cd2898ad3c76d1f5068137a884024f521163':
  -hide AccountManagerResponse, which never should have been exposed in the first place
2009-11-19 10:24:47 -08:00
Dianne Hackborn
7e9f66f619 am e4260f4e: Fix build.
Merge commit 'e4260f4e7da4da32bfab2737018cf9cf75215894' into eclair-plus-aosp

* commit 'e4260f4e7da4da32bfab2737018cf9cf75215894':
  Fix build.
2009-11-18 21:22:39 -08:00
Dianne Hackborn
49ad311d91 am 23ef7b48: Fix most of issue #2271640: Fix wallpaper etc docs
Merge commit '23ef7b4836d66d31430fedee2aac36275bb30d4b' into eclair-plus-aosp

* commit '23ef7b4836d66d31430fedee2aac36275bb30d4b':
  Fix most of issue #2271640: Fix wallpaper etc docs
2009-11-18 19:07:46 -08:00
Scott Main
a2ededa0a7 am d2a9f54f: am afcd516e: Merge change Iaae72f66 into eclair-sdk
Merge commit 'd2a9f54f9ec997562623091d404e0208fd9ce5f8' into eclair-plus-aosp

* commit 'd2a9f54f9ec997562623091d404e0208fd9ce5f8':
  docs: misc edits to samples page and intro docs
2009-11-18 17:48:13 -08:00
Scott Main
574917c87f am afcd516e: Merge change Iaae72f66 into eclair-sdk
Merge commit 'afcd516e3e6378aaf97ff44b0b9ea233223ded65' into eclair

* commit 'afcd516e3e6378aaf97ff44b0b9ea233223ded65':
  docs: misc edits to samples page and intro docs
2009-11-18 17:12:35 -08:00
Jean-Michel Trivi
1d41c48ec3 am a0e37e9d: Merge change I941136fd into eclair
Merge commit 'a0e37e9defea04e8c0d97828db02361fe511c53f' into eclair-plus-aosp

* commit 'a0e37e9defea04e8c0d97828db02361fe511c53f':
  Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
2009-11-18 17:04:41 -08:00
Android (Google) Code Review
8355ab6a49 Merge change I941136fd into eclair
* changes:
  Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource to define how the two new audio sources behave when used on devices that don't support them.
2009-11-18 17:00:16 -08:00
Mike Lockwood
291a3d04a8 am 03786b83: Merge change I813fdb7a into eclair
Merge commit '03786b83bd02f8dd8e1049d333fbfdee395ac965' into eclair-plus-aosp

* commit '03786b83bd02f8dd8e1049d333fbfdee395ac965':
  Fixes for proximity sensor behavior:
2009-11-18 16:24:59 -08:00
Android (Google) Code Review
0e6eff4a20 Merge change I813fdb7a into eclair
* changes:
  Fixes for proximity sensor behavior:
2009-11-18 16:20:32 -08:00
Dianne Hackborn
400d806825 am dfc066e7: Merge change I5ad37324 into eclair
Merge commit 'dfc066e769ec227b4dbf0e2e5097973c20c2b34f' into eclair-plus-aosp

* commit 'dfc066e769ec227b4dbf0e2e5097973c20c2b34f':
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
2009-11-18 15:13:12 -08:00
Android (Google) Code Review
ba11cf6259 Merge change I5ad37324 into eclair
* changes:
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
2009-11-18 15:09:18 -08:00
Android (Google) Code Review
cd109bd60d Merge change Iaae72f66 into eclair-sdk
* changes:
  docs: misc edits to samples page and intro docs make samples page accessible from offline version instead of redirecting to the user filesystem and include instructions for creating projects based on the sample apps. fix a link and add some content to the What is android doc.
2009-11-18 14:08:08 -08:00
Jim Miller
dd44124a63 am 30142f7e: Merge change I9f239766 into eclair
Merge commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d' into eclair-plus-aosp

* commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d':
  Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
2009-11-18 13:32:30 -08:00
Android (Google) Code Review
76ca0aea4d Merge change I9f239766 into eclair
* changes:
  Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
2009-11-18 13:26:30 -08:00
Amith Yamasani
1e4c797032 am 778f1e65: Merge change Icfc893d2 into eclair
Merge commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d' into eclair-plus-aosp

* commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d':
  Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
2009-11-18 13:07:00 -08:00
Android (Google) Code Review
a42402d05e Merge change Icfc893d2 into eclair
* changes:
  Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
2009-11-18 12:38:30 -08:00
Dianne Hackborn
507ec74c21 am 1d62ea9d: Fix issue #2249821: Unable to start passion in safe mode
Merge commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e' into eclair-plus-aosp

* commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e':
  Fix issue #2249821: Unable to start passion in safe mode
2009-11-18 11:49:59 -08:00
Jim Miller
7152689d8a am 30998a59: Merge change I587dd820 into eclair
Merge commit '30998a59aced3248b3a6f5e507dba0394fb54cad' into eclair-plus-aosp

* commit '30998a59aced3248b3a6f5e507dba0394fb54cad':
  Fix 2268841: Much better looking layout for pattern lock screen.
2009-11-17 22:58:08 -08:00
Android (Google) Code Review
71741ba165 Merge change I587dd820 into eclair
* changes:
  Fix 2268841: Much better looking layout for pattern lock screen.
2009-11-17 22:53:44 -08:00
Eric Fischer
24043b53ad am 04a0e969: Merge change Id7c432bf into eclair
Merge commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec' into eclair-plus-aosp

* commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec':
  Add vertical bar to the alt-space character picker for the hardware keyboard.
2009-11-17 17:54:23 -08:00
Android (Google) Code Review
38fc52236a Merge change Id7c432bf into eclair
* changes:
  Add vertical bar to the alt-space character picker for the hardware keyboard.
2009-11-17 17:51:37 -08:00
Jason Sams
911d0efc92 am fa0394c9: Merge change I715333b8 into eclair
Merge commit 'fa0394c9f89f13b53c6db2470253825b88cafb64' into eclair-plus-aosp

* commit 'fa0394c9f89f13b53c6db2470253825b88cafb64':
  Add support for dumping RS objects to aid in debugging of white blocks bug.
2009-11-17 17:36:27 -08:00
Jaikumar Ganesh
ec1c1f102f am 660282dc: Merge change I706fe6b0 into eclair
Merge commit '660282dc3e81784224945be0787a9e2d4276de8c' into eclair-plus-aosp

* commit '660282dc3e81784224945be0787a9e2d4276de8c':
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 17:36:06 -08:00
Android (Google) Code Review
eab3388392 Merge change I715333b8 into eclair
* changes:
  Add support for dumping RS objects to aid in debugging of white blocks bug.
2009-11-17 17:31:58 -08:00
Android (Google) Code Review
c620009ade Merge change I706fe6b0 into eclair
* changes:
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 16:07:58 -08:00
Evan Millar
4ce62ac009 am 6bcd99c2: Merge change I1b6d202b into eclair
Merge commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef' into eclair-plus-aosp

* commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef':
  Move photo querying off main thread.
2009-11-17 14:45:00 -08:00
Android (Google) Code Review
2ea3e7f3d2 Merge change I1b6d202b into eclair
* changes:
  Move photo querying off main thread.
2009-11-17 14:40:40 -08:00
Ray Chen
b9873bd0ad am b3f35041: Merge change I86db22ef into eclair
Merge commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6' into eclair-plus-aosp

* commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6':
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 14:27:53 -08:00