Commit Graph

5173 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Daisuke Miyakawa
e4c4843c71 am d557614f: am f016fa63: Merge change Ib1f7c3cb into eclair-mr2
Merge commit 'd557614f3a8b5e25c9e1160bb28b4bdc7850c1c2'

* commit 'd557614f3a8b5e25c9e1160bb28b4bdc7850c1c2':
  Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.
2009-11-17 07:30:43 -08:00
Leon Scroggins
bb74b6f7d7 am daf05d3e: am a57632fe: Fix bugs around removing and attaching WebViews.
Merge commit 'daf05d3e91e817825562055cbf0b67e704defc7a'

* commit 'daf05d3e91e817825562055cbf0b67e704defc7a':
  Fix bugs around removing and attaching WebViews.
2009-11-17 07:29:50 -08:00
Daisuke Miyakawa
2227ecd1bf am d5f787ab: am 9e807d7c: Merge change Iecf85b40 into eclair-mr2
Merge commit 'd5f787ab28199d417f8a50ccd031e31f5c6db509'

* commit 'd5f787ab28199d417f8a50ccd031e31f5c6db509':
  Rename several files so that readers would not be confused.
2009-11-17 07:28:35 -08:00
Daisuke Miyakawa
a4d3fae76a am a184d4b9: Merge change I11526e6c into eclair-mr2
Merge commit 'a184d4b95d22b9124ad6f22815fd10b04995bcf5' into eclair-mr2-plus-aosp

* commit 'a184d4b95d22b9124ad6f22815fd10b04995bcf5':
  Clean up codes and remove/modify stale codes/comments.
2009-11-17 01:07:27 -08:00
Daisuke Miyakawa
d2145b97fb Clean up codes and remove/modify stale codes/comments.
Internal issue number: 2195990
2009-11-17 17:12:54 +09:00
Daisuke Miyakawa
feef7de25b am ac3e2159: Merge change Icaf78440 into eclair-mr2
Merge commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb' into eclair-mr2-plus-aosp

* commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb':
  Split vCard composer into two parts: VCardComposer and VCardBuilder.
2009-11-16 21:35:19 -08:00
Android (Google) Code Review
ac3e2159b4 Merge change Icaf78440 into eclair-mr2
* changes:
  Split vCard composer into two parts: VCardComposer and VCardBuilder.
2009-11-16 21:31:49 -08:00
Daisuke Miyakawa
1b9e2bec63 Split vCard composer into two parts: VCardComposer and VCardBuilder.
As for VCardBuilder, there was a class with the same name, but this implementation is fundamentally different.
This time, VCardBuilder is like StringBuilder. It enables developers to create their own vCard by themselves.

Make Constants public and rename it to VCardConstants.

Internal issue number: 2242528, 2195990
2009-11-17 14:30:17 +09:00
Dianne Hackborn
003ac2c8e9 am beaf87bf: am 60d7db4c: Fix #2262593: 42 ANR reports from android.process.acore
Merge commit 'beaf87bfec29378b27bd28c1d1d2c4db1116d7ce' into eclair-mr2-plus-aosp

* commit 'beaf87bfec29378b27bd28c1d1d2c4db1116d7ce':
  Fix #2262593: 42 ANR reports from android.process.acore
2009-11-16 20:04:28 -08:00
Dianne Hackborn
beaf87bfec am 60d7db4c: Fix #2262593: 42 ANR reports from android.process.acore
Merge commit '60d7db4c3e3d60060e7ac021445ea1f510b7a1fb' into eclair-mr2

* commit '60d7db4c3e3d60060e7ac021445ea1f510b7a1fb':
  Fix #2262593: 42 ANR reports from android.process.acore
2009-11-16 19:55:13 -08:00
Jaikumar Ganesh
8c9dd7d8b9 Check if Bluetooth is enabled before making any calls down.
This was causing problems when apps were making calls, without
turning on BT first.

Bug: 2234918
Dr No: Eastham
2009-11-16 17:29:27 -08:00
Dianne Hackborn
60d7db4c3e Fix #2262593: 42 ANR reports from android.process.acore
There was a lock in AssetManager that purported to be per-instance (mSync)
but was actually static.  A lot of code used it like it was per-instance,
but this would actually block all instances.  This is now changed to fix
the name and make everything except the actual static data lock on the
specific AssetManager instance.

Change-Id: Ie8e9ad60f962184e76b2301f7a2790d0c2487063
2009-11-16 17:16:26 -08:00
Jack Wang
e5fa335b0d am 6e045e0a: am e0cadd7c: Merge change Iffbb6e55 into eclair
Merge commit '6e045e0aa1b465e9e989d3058a5d2fa13dcf026b' into eclair-mr2-plus-aosp

* commit '6e045e0aa1b465e9e989d3058a5d2fa13dcf026b':
  Make perf metrics collection & output via instrumentation simpler
2009-11-16 15:29:15 -08:00
Jack Wang
6e045e0aa1 am e0cadd7c: Merge change Iffbb6e55 into eclair
Merge commit 'e0cadd7cd811a674df62279dec00d17678b2c501' into eclair-mr2

* commit 'e0cadd7cd811a674df62279dec00d17678b2c501':
  Make perf metrics collection & output via instrumentation simpler
2009-11-16 15:25:06 -08:00
Android (Google) Code Review
e0cadd7cd8 Merge change Iffbb6e55 into eclair
* changes:
  Make perf metrics collection & output via instrumentation simpler
2009-11-16 15:20:46 -08:00
Jeff Sharkey
35d857002d am 8059bcbf: resolved conflicts for merge of 1162fd77 to eclair-mr2
Merge commit '8059bcbfa71c8233e616304843d9280f5f1615bb' into eclair-mr2-plus-aosp

* commit '8059bcbfa71c8233e616304843d9280f5f1615bb':
  Let RemoteViews nest children, allow ViewFlipper.
2009-11-16 14:55:37 -08:00
Jeff Sharkey
8059bcbfa7 resolved conflicts for merge of 1162fd77 to eclair-mr2 2009-11-16 14:49:07 -08:00
Daisuke Miyakawa
d557614f3a am f016fa63: Merge change Ib1f7c3cb into eclair-mr2
Merge commit 'f016fa632b1d3c606934bc11a889af3921c6120e' into eclair-mr2-plus-aosp

* commit 'f016fa632b1d3c606934bc11a889af3921c6120e':
  Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.
2009-11-16 14:41:28 -08:00
Leon Scroggins
daf05d3e91 am a57632fe: Fix bugs around removing and attaching WebViews.
Merge commit 'a57632fee792d6078a7a61006f5a866c38addd33' into eclair-mr2-plus-aosp

* commit 'a57632fee792d6078a7a61006f5a866c38addd33':
  Fix bugs around removing and attaching WebViews.
2009-11-16 14:37:58 -08:00
Daisuke Miyakawa
d5f787ab28 am 9e807d7c: Merge change Iecf85b40 into eclair-mr2
Merge commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b' into eclair-mr2-plus-aosp

* commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b':
  Rename several files so that readers would not be confused.
2009-11-16 14:36:17 -08:00
Jeff Sharkey
1162fd77a8 Let RemoteViews nest children, allow ViewFlipper.
This change allows applications to nest children RemoteViews
inside an existing set of RemoteViews.  These nested views
are inflated and treated as addView() calls.

This change also allows ViewFlipper through RemoteViews, and
adds logic surpress flipping when the parent window is
detached or behind the lockscreen.  Also fixes ViewAnimator
to observe the measureAllChildren flag when set.

Fixes http://b/2239905
2009-11-16 14:27:19 -08:00
Android (Google) Code Review
f016fa632b Merge change Ib1f7c3cb into eclair-mr2
* changes:
  Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.
2009-11-16 13:19:08 -08:00