Commit Graph

5579 Commits

Author SHA1 Message Date
Amith Yamasani
8488a6013e am 41029cf4: am 9335d414: am 778f1e65: Merge change Icfc893d2 into eclair
Merge commit '41029cf413abbfdf004e04f192a440e457701c47'

* commit '41029cf413abbfdf004e04f192a440e457701c47':
  Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
2009-11-18 17:51:45 -08:00
Dan Egnor
20fbb79825 resolved conflicts for merge of a351b7f0 to master 2009-11-18 13:43:10 -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
14d9431a5f am 08a22a20: am a2f4c254: am 1d62ea9d: Fix issue #2249821: Unable to start passion in safe mode
Merge commit '08a22a200739e0e14784e1c7139ed78e50c15dfa'

* commit '08a22a200739e0e14784e1c7139ed78e50c15dfa':
  Fix issue #2249821: Unable to start passion in safe mode
2009-11-18 12:03:41 -08:00
Grace Kloba
bbf4c864cd am f28ae14f: 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 'f28ae14f8fc146c42cb817e15363cac0e2b0ab11'

* commit 'f28ae14f8fc146c42cb817e15363cac0e2b0ab11':
  Do not grow the viewport width to infinite to fit
2009-11-18 11:58:21 -08:00
Cary Clark
ae3f79ce6e am ad6e111a: am 188f40d7: Merge change Ibb994bd2 into eclair-mr2
Merge commit 'ad6e111a4ae5c7c1bb90025a5f2d6f7518ae048f'

* commit 'ad6e111a4ae5c7c1bb90025a5f2d6f7518ae048f':
  rename nativeFindIsDown to nativeFindIsUp; check for null webkit
2009-11-18 11:57:57 -08:00
Daisuke Miyakawa
0f3bd555b9 am 355c4bc3: am a3dbee32: Merge change I919c20bb into eclair-mr2
Merge commit '355c4bc31c350030a636f7a864cdcd863e71eae9'

* commit '355c4bc31c350030a636f7a864cdcd863e71eae9':
  Code clean up.
2009-11-18 11:57:29 -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
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   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
Daisuke Miyakawa
49c0decf46 Code clean up.
Internal issue number: 2195990
2009-11-18 17:18:53 +09:00
Eric Fischer
f9cf96ae1d am 1f60ff34: am e45ebbaf: am 04a0e969: Merge change Id7c432bf into eclair
Merge commit '1f60ff34cd353235eedb20bd0c6e2d4a1e6bcc06'

* commit '1f60ff34cd353235eedb20bd0c6e2d4a1e6bcc06':
  Add vertical bar to the alt-space character picker for the hardware keyboard.
2009-11-17 18:11:48 -08:00
Daisuke Miyakawa
18b5fc06af am 7798d36a: am d2f813c3: Merge change I60cfe9ce into eclair-mr2
Merge commit '7798d36a4661ac8c88eb47cf0c66d3eeafb2f7a8'

* commit '7798d36a4661ac8c88eb47cf0c66d3eeafb2f7a8':
  Add unit tests.
2009-11-17 18:11:19 -08:00
Eric Fischer
1f60ff34cd am e45ebbaf: am 04a0e969: Merge change Id7c432bf into eclair
Merge commit 'e45ebbaf1b4450bb65fa13aaa3e64243ab838435' into eclair-mr2-plus-aosp

* commit 'e45ebbaf1b4450bb65fa13aaa3e64243ab838435':
  Add vertical bar to the alt-space character picker for the hardware keyboard.
2009-11-17 17:59:09 -08:00
Eric Fischer
e45ebbaf1b am 04a0e969: Merge change Id7c432bf into eclair
Merge commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec' into eclair-mr2

* commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec':
  Add vertical bar to the alt-space character picker for the hardware keyboard.
2009-11-17 17:54:31 -08:00
Android (Google) Code Review
04a0e969c6 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
Jaikumar Ganesh
e30c29feea am bc9f6292: am 4fea2919: am 660282dc: Merge change I706fe6b0 into eclair
Merge commit 'bc9f62920aa7cc436cd1934bc7dfa1e9e70cd96d'

* commit 'bc9f62920aa7cc436cd1934bc7dfa1e9e70cd96d':
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 17:45:22 -08:00
Daisuke Miyakawa
7798d36a46 am d2f813c3: Merge change I60cfe9ce into eclair-mr2
Merge commit 'd2f813c3f85060d42744be2632fed20f520001ee' into eclair-mr2-plus-aosp

* commit 'd2f813c3f85060d42744be2632fed20f520001ee':
  Add unit tests.
2009-11-17 17:41:17 -08:00
Jaikumar Ganesh
bc9f62920a am 4fea2919: am 660282dc: Merge change I706fe6b0 into eclair
Merge commit '4fea2919abeba149376fed98a14e3ffc8464eadf' into eclair-mr2-plus-aosp

* commit '4fea2919abeba149376fed98a14e3ffc8464eadf':
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 17:40:45 -08:00
Android (Google) Code Review
d2f813c3f8 Merge change I60cfe9ce into eclair-mr2
* changes:
  Add unit tests.
2009-11-17 17:38:07 -08:00
Daisuke Miyakawa
839c036444 Add unit tests.
Internal issue number: 2195990
2009-11-18 10:35:39 +09:00
Jaikumar Ganesh
4fea2919ab am 660282dc: Merge change I706fe6b0 into eclair
Merge commit '660282dc3e81784224945be0787a9e2d4276de8c' into eclair-mr2

* commit '660282dc3e81784224945be0787a9e2d4276de8c':
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 17:35:25 -08:00
Eric Fischer
d7c432bf7f Add vertical bar to the alt-space character picker for the hardware keyboard.
Bug 2242177

Approver: jerryw
2009-11-17 16:28:30 -08:00
Evan Millar
813d11a91a am a6780991: am e53c9a81: am 6bcd99c2: Merge change I1b6d202b into eclair
Merge commit 'a67809918f6c212630da0b359628d0e8722b091f'

* commit 'a67809918f6c212630da0b359628d0e8722b091f':
  Move photo querying off main thread.
2009-11-17 16:14:15 -08:00
Mark Wagner
69020b7325 am fe537b3f: am 0e3fccf1: Merge change Icef599ec into eclair-mr2
Merge commit 'fe537b3fe4145e3cec41b70b93c366e1c2307ed5'

* commit 'fe537b3fe4145e3cec41b70b93c366e1c2307ed5':
  null check
2009-11-17 16:13:16 -08:00
Android (Google) Code Review
660282dc3e 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
a67809918f am e53c9a81: am 6bcd99c2: Merge change I1b6d202b into eclair
Merge commit 'e53c9a81e5208bc51ee8e365f19ff867897e63af' into eclair-mr2-plus-aosp

* commit 'e53c9a81e5208bc51ee8e365f19ff867897e63af':
  Move photo querying off main thread.
2009-11-17 16:05:58 -08:00
Mark Wagner
fe537b3fe4 am 0e3fccf1: Merge change Icef599ec into eclair-mr2
Merge commit '0e3fccf1a525883aa5d80e10ced5b7af48cfe5a1' into eclair-mr2-plus-aosp

* commit '0e3fccf1a525883aa5d80e10ced5b7af48cfe5a1':
  null check
2009-11-17 16:05:12 -08:00
Daisuke Miyakawa
c1df1ddc3b am a4d3fae7: am a184d4b9: Merge change I11526e6c into eclair-mr2
Merge commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb'

* commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb':
  Clean up codes and remove/modify stale codes/comments.
2009-11-17 15:07:49 -08:00
Jim Miller
c0c999a43c am 8bf56e6a: am c0b0ad21: am f0166e4d: Merge change I4f01d4a4 into eclair
Merge commit '8bf56e6a1bb842aaae2b8b7630d2bc2711f36bb6'

* commit '8bf56e6a1bb842aaae2b8b7630d2bc2711f36bb6':
  Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
2009-11-17 15:06:41 -08:00
Daisuke Miyakawa
675cab9240 am feef7de2: am ac3e2159: Merge change Icaf78440 into eclair-mr2
Merge commit 'feef7de25b3dc68f1d75c1c2171ddb5bd2169d8c'

* commit 'feef7de25b3dc68f1d75c1c2171ddb5bd2169d8c':
  Split vCard composer into two parts: VCardComposer and VCardBuilder.
2009-11-17 15:06:00 -08:00
Evan Millar
e53c9a81e5 am 6bcd99c2: Merge change I1b6d202b into eclair
Merge commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef' into eclair-mr2

* commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef':
  Move photo querying off main thread.
2009-11-17 14:45:13 -08:00
Android (Google) Code Review
0e3fccf1a5 Merge change Icef599ec into eclair-mr2
* changes:
  null check
2009-11-17 14:09:14 -08:00
Mark Wagner
cef599ec8c null check 2009-11-17 13:58:07 -08:00
Cary Clark
32847a97e1 rename nativeFindIsDown to nativeFindIsUp; check for null webkit
companion fix is in external/webkit

fixes bug http://b/issue?id=2264941
2009-11-17 16:08:49 -05:00
Evan Millar
1b6d202bd4 Move photo querying off main thread.
Fixes bug http://b/issue?id=2265642
2009-11-17 12:07:41 -08:00
Dianne Hackborn
87e5afb6e4 am 003ac2c8: am beaf87bf: am 60d7db4c: Fix #2262593: 42 ANR reports from android.process.acore
Merge commit '003ac2c8e9a684a28180dac01340c759bf321cfd'

* commit '003ac2c8e9a684a28180dac01340c759bf321cfd':
  Fix #2262593: 42 ANR reports from android.process.acore
2009-11-17 07:37:08 -08:00
Jack Wang
90ea9af3e1 am e5fa335b: am 6e045e0a: am e0cadd7c: Merge change Iffbb6e55 into eclair
Merge commit 'e5fa335b0dffbd06385b6de05ae04b2bd2ea277e'

* commit 'e5fa335b0dffbd06385b6de05ae04b2bd2ea277e':
  Make perf metrics collection & output via instrumentation simpler
2009-11-17 07:33:59 -08:00
Jeff Sharkey
04b963ad7c am 35d85700: am 8059bcbf: resolved conflicts for merge of 1162fd77 to eclair-mr2
Merge commit '35d857002dcbc24d05a0f9d157ce8ee1927ae235'

* commit '35d857002dcbc24d05a0f9d157ce8ee1927ae235':
  Let RemoteViews nest children, allow ViewFlipper.
2009-11-17 07:32:55 -08:00