Commit Graph

7114 Commits

Author SHA1 Message Date
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
Joe Onorato
8e82300bbd am df7dbb68: Fix bug 2252145 - Notification panel not closing completely when a call comes in
Merge commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871' into eclair-plus-aosp

* commit 'df7dbb68d330eae88c1ca6d03390dc8c18386871':
  Fix bug 2252145 - Notification panel not closing completely when a call comes in
2009-11-17 14:24:15 -08:00
Android (Google) Code Review
db0438250f Merge change I86db22ef into eclair
* changes:
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
2009-11-17 14:23:36 -08:00
Jim Miller
4e550f523e am f0166e4d: Merge change I4f01d4a4 into eclair
Merge commit 'f0166e4dd0907e487531960e36f516406d265b73' into eclair-plus-aosp

* commit 'f0166e4dd0907e487531960e36f516406d265b73':
  Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
2009-11-16 23:52:25 -08:00
Android (Google) Code Review
650e20125c Merge change I4f01d4a4 into eclair
* changes:
  Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
2009-11-16 23:48:28 -08:00
Mike Lockwood
afc19e511b am f8c4af65: Merge change I51b84496 into eclair
Merge commit 'f8c4af65e8f9c7f395ac8eb52fe741242f6747b6' into eclair-plus-aosp

* commit 'f8c4af65e8f9c7f395ac8eb52fe741242f6747b6':
  Revert "PowerManagerService: enable logging for when mPowerState changes."
2009-11-16 19:06:59 -08:00
Android (Google) Code Review
0517b16c9a Merge change I51b84496 into eclair
* changes:
  Revert "PowerManagerService: enable logging for when mPowerState changes."
2009-11-16 19:04:06 -08:00
Scott Main
432418c918 am 06ddc677: am 00ecac95: Merge change If556e259 into eclair-sdk
Merge commit '06ddc67797388da6260e43579c7ebd506b5b376c' into eclair-plus-aosp

* commit '06ddc67797388da6260e43579c7ebd506b5b376c':
  docs: remove all content from the older sdk download,
2009-11-16 18:30:28 -08:00
Scott Main
50f80738b2 am 00ecac95: Merge change If556e259 into eclair-sdk
Merge commit '00ecac957c4a5d2df132640ff418280d969e7d83' into eclair

* commit '00ecac957c4a5d2df132640ff418280d969e7d83':
  docs: remove all content from the older sdk download,
2009-11-16 18:25:56 -08:00
Android (Google) Code Review
033e4eb913 Merge change If556e259 into eclair-sdk
* changes:
  docs: remove all content from the older sdk download, install, and requirements pages and redirect to the new sdk pages. Also update the "older sdks" doc to include all version-specific sdks. also update the robots file to disallow indexing of the old sdk docs.
2009-11-16 18:19:10 -08:00
Mike Cleron
59010a448f am f36b8f43: Merge change Ia428b2c2 into eclair
Merge commit 'f36b8f439babc141970b1207d1d9c12b7a14c468' into eclair-plus-aosp

* commit 'f36b8f439babc141970b1207d1d9c12b7a14c468':
  This time for sure: make wallpapers work
2009-11-16 18:05:51 -08:00
Dianne Hackborn
94095be6f6 am 9ddb7df8: Fix build.
Merge commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6' into eclair-plus-aosp

* commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6':
  Fix build.
2009-11-16 18:05:34 -08:00
Android (Google) Code Review
dd74998eab Merge change Ia428b2c2 into eclair
* changes:
  This time for sure: make wallpapers work
2009-11-16 18:02:20 -08:00
Adam Bliss
3405c8aa3f am 69e0b664: Merge change I000d3564 into eclair
Merge commit '69e0b6646f109d17a5cff4b8c32582e3d3a3f544' into eclair-plus-aosp

* commit '69e0b6646f109d17a5cff4b8c32582e3d3a3f544':
  Move map tiles to no-dpi since they are dpi-independent.
2009-11-16 17:56:44 -08:00
Android (Google) Code Review
535d5aa0b0 Merge change I000d3564 into eclair
* changes:
  Move map tiles to no-dpi since they are dpi-independent.
2009-11-16 17:53:20 -08:00
Dianne Hackborn
ad1e62cf57 am 60d7db4c: Fix #2262593: 42 ANR reports from android.process.acore
Merge commit '60d7db4c3e3d60060e7ac021445ea1f510b7a1fb' into eclair-plus-aosp

* commit '60d7db4c3e3d60060e7ac021445ea1f510b7a1fb':
  Fix #2262593: 42 ANR reports from android.process.acore
2009-11-16 17:36:32 -08:00
Dianne Hackborn
0425d3fab4 am ab5efde8: Merge change Iff5b8ce3 into eclair
Merge commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679' into eclair-plus-aosp

* commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679':
  Work on issue 2259506: camera ANRed and then device runtime restarted
2009-11-16 16:36:30 -08:00
Android (Google) Code Review
0cfbff7bda Merge change Iff5b8ce3 into eclair
* changes:
  Work on issue 2259506: camera ANRed and then device runtime restarted
2009-11-16 16:33:41 -08:00
Jack Palevich
be866756f3 am dc49acb0: Merge change Ica8c305a into eclair
Merge commit 'dc49acb0289cab2a6e0d73e66b69516605893e28' into eclair-plus-aosp

* commit 'dc49acb0289cab2a6e0d73e66b69516605893e28':
  More GLSurfaceView cleanup.
2009-11-16 15:52:59 -08:00
Android (Google) Code Review
52f7cae90c Merge change Ica8c305a into eclair
* changes:
  More GLSurfaceView cleanup.
2009-11-16 15:48:47 -08:00
Jack Wang
5bd60dda17 am e0cadd7c: Merge change Iffbb6e55 into eclair
Merge commit 'e0cadd7cd811a674df62279dec00d17678b2c501' into eclair-plus-aosp

* commit 'e0cadd7cd811a674df62279dec00d17678b2c501':
  Make perf metrics collection & output via instrumentation simpler
2009-11-16 15:25:01 -08:00
Android (Google) Code Review
6e1fc55d1f Merge change Iffbb6e55 into eclair
* changes:
  Make perf metrics collection & output via instrumentation simpler
2009-11-16 15:20:46 -08:00
Mathias Agopian
e34b756fca am f998c4a2: Merge change I1c0bebbc into eclair
Merge commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806' into eclair-plus-aosp

* commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806':
  fix [2262591] Junk on screen in ERD46
2009-11-16 15:08:12 -08:00
Android (Google) Code Review
1c84c754e3 Merge change I1c0bebbc into eclair
* changes:
  fix [2262591] Junk on screen in ERD46
2009-11-16 15:05:16 -08:00
Mathias Agopian
9e911efc10 fix [2262591] Junk on screen in ERD46
since we're using the GPU for composition, don't use a texture for dimming,
instead simply use an alpha-blended quad.

also workaround what looks like a GL driver bug by calling glFinish() before
glReadPixels().
2009-11-16 14:55:36 -08:00