12881 Commits

Author SHA1 Message Date
Scott Main
9d6704f9f1 am d2a9f54f: am afcd516e: Merge change Iaae72f66 into eclair-sdk
Merge commit 'd2a9f54f9ec997562623091d404e0208fd9ce5f8' into eclair-mr2

* commit 'd2a9f54f9ec997562623091d404e0208fd9ce5f8':
  docs: misc edits to samples page and intro docs
2009-11-18 17:18:16 -08:00
repo sync
d28fcd5bb8 resolved conflicts for merge of efd91d7c to eclair-mr2-plus-aosp
Signed-off-by: repo sync <lockwood@android.com>
2009-11-18 20:13:09 -05:00
Scott Main
d2a9f54f9e 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
4eaf35b99d am a0e37e9d: Merge change I941136fd into eclair
Merge commit 'a0e37e9defea04e8c0d97828db02361fe511c53f' into eclair-mr2

* commit 'a0e37e9defea04e8c0d97828db02361fe511c53f':
  Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource
2009-11-18 17:04:30 -08:00
Android (Google) Code Review
a0e37e9def 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
efd91d7ce0 am 03786b83: Merge change I813fdb7a into eclair
Merge commit '03786b83bd02f8dd8e1049d333fbfdee395ac965' into eclair-mr2

* commit '03786b83bd02f8dd8e1049d333fbfdee395ac965':
  Fixes for proximity sensor behavior:
2009-11-18 16:24:37 -08:00
Android (Google) Code Review
03786b83bd Merge change I813fdb7a into eclair
* changes:
  Fixes for proximity sensor behavior:
2009-11-18 16:20:32 -08:00
Daisuke Miyakawa
5b2f5ced25 am ddd017f8: Merge change I8daabf26 into eclair-mr2
Merge commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05' into eclair-mr2-plus-aosp

* commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05':
  Modify vCard exporter code so that it does not emit non-Ascii type.
2009-11-18 16:16:33 -08:00
Jean-Michel Trivi
941136fd08 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 16:15:12 -08:00
lknguyen
194f080892 Add Gservices flag so that Market can turn on performance logging for specific groups. 2009-11-18 16:12:51 -08:00
Android (Google) Code Review
ddd017f872 Merge change I8daabf26 into eclair-mr2
* changes:
  Modify vCard exporter code so that it does not emit non-Ascii type.
2009-11-18 16:11:35 -08:00
Daisuke Miyakawa
c4b51712d8 Modify vCard exporter code so that it does not emit non-Ascii type.
Also add unit tests.

Internal issue number: 2195990
2009-11-19 09:09:27 +09:00
Mike Lockwood
0e39ea83c5 Fixes for proximity sensor behavior:
Add optional flag to Wakelock.release() to specify whether we should wait for proximity sensor to go negative before turning on the screen.
Clear the "waiting for proximity sensor to go negative" state when the power key is pressed.

Part of the fix for b/2243198 (Black screen lockup after ending call)

Change-Id: I813fdb7aa4192cd3384a25be9e59d7d4b90da53a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-18 18:45:59 -05:00
Dianne Hackborn
822d8f67eb am bdcd30ac: am dfc066e7: Merge change I5ad37324 into eclair
Merge commit 'bdcd30acb3a1ce617f67becd69a7c5bc1037c428' into eclair-mr2-plus-aosp

* commit 'bdcd30acb3a1ce617f67becd69a7c5bc1037c428':
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
2009-11-18 15:17:17 -08:00
Dianne Hackborn
bdcd30acb3 am dfc066e7: Merge change I5ad37324 into eclair
Merge commit 'dfc066e769ec227b4dbf0e2e5097973c20c2b34f' into eclair-mr2

* commit 'dfc066e769ec227b4dbf0e2e5097973c20c2b34f':
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
2009-11-18 15:12:59 -08:00
Android (Google) Code Review
dfc066e769 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
Dan Egnor
cc342e3365 Solve the mutual interdependency problem between common and framework:
Have framework include the common source files directly when building,
then build common as a static library separately (depending on
framework, like everything else).

Goes with a companion change to build/core/pathmap.mk.
2009-11-18 15:08:18 -08:00
Dan Egnor
11f5fe94a0 am b9386ed9: Merge change Ic9e65818 into eclair-mr2
Merge commit 'b9386ed929b72308cbfc68d2833a13aeda38f431' into eclair-mr2-plus-aosp

* commit 'b9386ed929b72308cbfc68d2833a13aeda38f431':
  Attempt to fix the build server build: make the common library
2009-11-18 14:20:13 -08:00
Android (Google) Code Review
b9386ed929 Merge change Ic9e65818 into eclair-mr2
* changes:
  Attempt to fix the build server build: make the common library not depend on the framework library (for now, at least).
2009-11-18 14:15:58 -08:00
Dan Egnor
c9e6581809 Attempt to fix the build server build: make the common library
not depend on the framework library (for now, at least).
2009-11-18 14:14:10 -08:00
Android (Google) Code Review
afcd516e3e 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
5d81e8c82a am 43733460: am 30142f7e: Merge change I9f239766 into eclair
Merge commit '4373346073250b668c0ff287b0d584401f7f3c96' into eclair-mr2-plus-aosp

* commit '4373346073250b668c0ff287b0d584401f7f3c96':
  Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
2009-11-18 13:35:43 -08:00
Jim Miller
4373346073 am 30142f7e: Merge change I9f239766 into eclair
Merge commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d' into eclair-mr2

* 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:01 -08:00
Android (Google) Code Review
30142f7ef7 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
41029cf413 am 9335d414: am 778f1e65: Merge change Icfc893d2 into eclair
Merge commit '9335d414bd2af5bb1ad74459de165a3d93a9ca7b' into eclair-mr2-plus-aosp

* commit '9335d414bd2af5bb1ad74459de165a3d93a9ca7b':
  Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
2009-11-18 13:15:55 -08:00
Amith Yamasani
9335d414bd am 778f1e65: Merge change Icfc893d2 into eclair
Merge commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d' into eclair-mr2

* commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d':
  Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
2009-11-18 13:10:53 -08:00
Dan Egnor
a351b7f0c6 am 8c7d9eab: Merge change Icb1674f1 into eclair-mr2
Merge commit '8c7d9eab8aa297f5ee3a171c6fa63fcf94e2b330' into eclair-mr2-plus-aosp

* commit '8c7d9eab8aa297f5ee3a171c6fa63fcf94e2b330':
  Create android-common static library which gets included in frameworks.jar,
2009-11-18 13:08:52 -08:00
Android (Google) Code Review
8c7d9eab8a Merge change Icb1674f1 into eclair-mr2
* changes:
  Create android-common static library which gets included in frameworks.jar, but can also be used by unbundled apps.  Move android.text.util.Regex there as a starting example, renamed to a more sensible (?) com.android.common.Patterns. Set up a corresponding test package, and move RegexTest (to PatternsTest). Update clients.
2009-11-18 12:40:44 -08:00
Android (Google) Code Review
778f1e65a5 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
Dan Egnor
ded0e6447e Create android-common static library which gets included in frameworks.jar,
but can also be used by unbundled apps.  Move android.text.util.Regex there as
a starting example, renamed to a more sensible (?) com.android.common.Patterns.
Set up a corresponding test package, and move RegexTest (to PatternsTest).
Update clients.
2009-11-18 12:05:04 -08:00
Dianne Hackborn
08a22a2007 am a2f4c254: am 1d62ea9d: Fix issue #2249821: Unable to start passion in safe mode
Merge commit 'a2f4c2543a7f78b77491c701230e8f406dcca540' into eclair-mr2-plus-aosp

* commit 'a2f4c2543a7f78b77491c701230e8f406dcca540':
  Fix issue #2249821: Unable to start passion in safe mode
2009-11-18 11:55:41 -08:00
Dianne Hackborn
a2f4c2543a am 1d62ea9d: Fix issue #2249821: Unable to start passion in safe mode
Merge commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e' into eclair-mr2

* commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e':
  Fix issue #2249821: Unable to start passion in safe mode
2009-11-18 11:51:05 -08:00
Grace Kloba
f28ae14f8f am a4fa107f: Do not grow the viewport width to infinite to fit the content. Limit the overview viewport width to a level that if a site behaves badly, the WebView still does reasonably.
Merge commit 'a4fa107f97933a81c42ee3cd9ca3984c08e5ab25' into eclair-mr2-plus-aosp

* commit 'a4fa107f97933a81c42ee3cd9ca3984c08e5ab25':
  Do not grow the viewport width to infinite to fit
2009-11-18 11:48:08 -08:00
Dianne Hackborn
f931520287 Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
Don't hold the global package log while instantiated an AssetManager+Resources, since
this is a fairly heavy-weight operation, and if done in the background can starve the
foreground.

Change-Id: I5ad37324fb7c27ffdbf28e1498ca0ad667479580
2009-11-18 11:47:15 -08:00
Cary Clark
ad6e111a4a am 188f40d7: Merge change Ibb994bd2 into eclair-mr2
Merge commit '188f40d705fc50bb94c08c6da95f46b2f6993996' into eclair-mr2-plus-aosp

* commit '188f40d705fc50bb94c08c6da95f46b2f6993996':
  rename nativeFindIsDown to nativeFindIsUp; check for null webkit
2009-11-18 11:46:42 -08:00
Daisuke Miyakawa
355c4bc31c am a3dbee32: Merge change I919c20bb into eclair-mr2
Merge commit 'a3dbee32d1deab72e5bbf17ab34b961fb7ab4182' into eclair-mr2-plus-aosp

* commit 'a3dbee32d1deab72e5bbf17ab34b961fb7ab4182':
  Code clean up.
2009-11-18 11:46:03 -08:00
Dianne Hackborn
1d62ea9d8c Fix issue #2249821: Unable to start passion in safe mode
Holding down the trackball now works.

Also fix a little API check warning from Intent.

Change-Id: Icb1f901535cb521917bf7f847a93c4ff7861d20e
2009-11-18 11:42:32 -08:00
Amith Yamasani
cfc893d27a Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
Due to a change in cpu stepping values, the batterystats.bin file needs to
be wiped for Battery Use app to show CPU cost correctly.
Bumping up the version number of the file fixes this.
2009-11-18 10:39:14 -08:00
Grace Kloba
a4fa107f97 Do not grow the viewport width to infinite to fit
the content. Limit the overview viewport width to
a level that if a site behaves badly, the WebView
still does reasonably.

Partially fix http://b/issue?id=2209659
maps.yahoo.com keeps growing due to a layout bug.
This prevents the browser to go insane.

Partially fix http://b/issue?id=2215387
caltrain.com has a super long &nbsp; which caused
the page super wide. This prevents the browser to
become unusable.

This change will make sites like, caltrain.com/timetable.html
not fit all in the view. You have to scroll left
and right. And it is same as iPhone.
2009-11-18 09:25:15 -08:00
Android (Google) Code Review
188f40d705 Merge change Ibb994bd2 into eclair-mr2
* changes:
  rename nativeFindIsDown to nativeFindIsUp; check for null webkit
2009-11-18 04:36:27 -08:00
Jim Miller
1d0a152fa8 Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
This is an uber hack.  Since there is a race between resizing the view and getting
the orientation-changed notification, this just tries to avoid drawing the tabs in the
wrong orientation (based on what we *expect* to be the orientation specified in the layout
file for the SlidingTab). This masks the problem *most* of the time.
2009-11-18 01:46:00 -08:00
Jim Miller
86103cd7db resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp 2009-11-18 00:36:32 -08:00
Android (Google) Code Review
a3dbee32d1 Merge change I919c20bb into eclair-mr2
* changes:
  Code clean up.
2009-11-18 00:19:52 -08:00
Daisuke Miyakawa
49c0decf46 Code clean up.
Internal issue number: 2195990
2009-11-18 17:18:53 +09:00
Jim Miller
b039668155 resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp 2009-11-17 23:20:37 -08:00
Jim Miller
ee3fd99a0b am 30998a59: Merge change I587dd820 into eclair
Merge commit '30998a59aced3248b3a6f5e507dba0394fb54cad' into eclair-mr2

* commit '30998a59aced3248b3a6f5e507dba0394fb54cad':
  Fix 2268841: Much better looking layout for pattern lock screen.
2009-11-17 22:58:23 -08:00
Android (Google) Code Review
30998a59ac Merge change I587dd820 into eclair
* changes:
  Fix 2268841: Much better looking layout for pattern lock screen.
2009-11-17 22:53:44 -08:00
Dan Egnor
5a0db121c8 am d68d6c6d: Merge change I0629175f into eclair-mr2
Merge commit 'd68d6c6ddabb6bc1e78b38c9c2dd6beda7970f8d' into eclair-mr2-plus-aosp

* commit 'd68d6c6ddabb6bc1e78b38c9c2dd6beda7970f8d':
  Remove googleclient from the framework, and its classes from the preload list.
2009-11-17 21:57:54 -08:00
Dan Egnor
5021e08d58 am 9a5985a8: Merge change I24e47245 into eclair-mr2
Merge commit '9a5985a8d975f88e314a321392cc7e25bd14ad0e' into eclair-mr2-plus-aosp

* commit '9a5985a8d975f88e314a321392cc7e25bd14ad0e':
  Add boot events (SYSTEM_LAST_KMSG and friends) to the dropbox.
2009-11-17 21:57:38 -08:00
Android (Google) Code Review
d68d6c6dda Merge change I0629175f into eclair-mr2
* changes:
  Remove googleclient from the framework, and its classes from the preload list.
2009-11-17 21:54:59 -08:00