OSDN Git Service
Ben Murdoch [Fri, 20 Nov 2009 10:26:22 +0000 (02:26 -0800)]
am
047a7495: am
65acc354: Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes.
Merge commit '
047a7495ce25b2ccb36dd2ab5c571ecd3bfa6369'
* commit '
047a7495ce25b2ccb36dd2ab5c571ecd3bfa6369':
Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes.
Ben Murdoch [Fri, 20 Nov 2009 10:22:32 +0000 (02:22 -0800)]
am
65acc354: Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes.
Merge commit '
65acc3541e4bcf8d9a0b3f59941c40fdb106c703' into eclair-mr2-plus-aosp
* commit '
65acc3541e4bcf8d9a0b3f59941c40fdb106c703':
Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes.
Ben Murdoch [Thu, 19 Nov 2009 18:16:04 +0000 (18:16 +0000)]
Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes.
BUG=
2271636
Change-Id: If41a260f24483e536794c975b532a966ac207e1f
Steve Block [Fri, 20 Nov 2009 01:39:56 +0000 (17:39 -0800)]
am
7ef8c876: am
2a6a0f47: Adds an explicit type for GeolocationPermissions.getOrigins.
Merge commit '
7ef8c8763874d54b66c8d9ca2a86c82e8ba70998'
* commit '
7ef8c8763874d54b66c8d9ca2a86c82e8ba70998':
Adds an explicit type for GeolocationPermissions.getOrigins.
Patrick Scott [Fri, 20 Nov 2009 01:39:48 +0000 (17:39 -0800)]
am
213be0c4: am
4af206a6: Merge change Ia964056a into eclair-mr2
Merge commit '
213be0c4a97cfb388450aaf48693678a3e3492fd'
* commit '
213be0c4a97cfb388450aaf48693678a3e3492fd':
Revert "Do not allow javascript to change window focus."
Steve Block [Thu, 19 Nov 2009 20:05:12 +0000 (12:05 -0800)]
am
2a6a0f47: Adds an explicit type for GeolocationPermissions.getOrigins.
Merge commit '
2a6a0f478fb9b67bf7398b1ba7c54ca9c9e430bf' into eclair-mr2-plus-aosp
* commit '
2a6a0f478fb9b67bf7398b1ba7c54ca9c9e430bf':
Adds an explicit type for GeolocationPermissions.getOrigins.
Steve Block [Thu, 19 Nov 2009 15:55:42 +0000 (15:55 +0000)]
Adds an explicit type for GeolocationPermissions.getOrigins.
This is a partial fix for bug http://b/issue?id=
2271636
Change-Id: If7c51332b8051ce2426d67962cb1cf2a9cb0f280
Patrick Scott [Thu, 19 Nov 2009 19:52:49 +0000 (11:52 -0800)]
am
4af206a6: Merge change Ia964056a into eclair-mr2
Merge commit '
4af206a6f656a27cfd4004241e1b84e05489eb94' into eclair-mr2-plus-aosp
* commit '
4af206a6f656a27cfd4004241e1b84e05489eb94':
Revert "Do not allow javascript to change window focus."
Android (Google) Code Review [Thu, 19 Nov 2009 19:48:07 +0000 (11:48 -0800)]
Merge change Ia964056a into eclair-mr2
* changes:
Revert "Do not allow javascript to change window focus."
Grace Kloba [Thu, 19 Nov 2009 18:49:17 +0000 (10:49 -0800)]
am
28292bc9: am
bb394f3e: Fix monkey crash. Check null for the top window in onActivityResult.
Merge commit '
28292bc903909245339baa36890c04286ef31a4d'
* commit '
28292bc903909245339baa36890c04286ef31a4d':
Fix monkey crash. Check null for the top window in
Grace Kloba [Thu, 19 Nov 2009 18:44:15 +0000 (10:44 -0800)]
am
bb394f3e: Fix monkey crash. Check null for the top window in onActivityResult.
Merge commit '
bb394f3e134b6e5898ef7ae861b75e95e618688f' into eclair-mr2-plus-aosp
* commit '
bb394f3e134b6e5898ef7ae861b75e95e618688f':
Fix monkey crash. Check null for the top window in
Grace Kloba [Thu, 19 Nov 2009 18:26:37 +0000 (10:26 -0800)]
Fix monkey crash. Check null for the top window in
onActivityResult.
Fix http://b/issue?id=
2254462
Patrick Scott [Wed, 18 Nov 2009 20:00:30 +0000 (15:00 -0500)]
Revert "Do not allow javascript to change window focus."
This reverts commit
9861276c209425ef5e92d01f0bf1cc65cf86e382.
Ben Murdoch [Thu, 19 Nov 2009 13:00:59 +0000 (05:00 -0800)]
am
a5a5fa3a: am
90d088ca: When long pressing to add a bookmark, use the title text returned from WebCore to populate the title field of the add bookmark dialog.
Merge commit '
a5a5fa3a09ea42c05ad7d9d484aab7a5b8ec64eb'
* commit '
a5a5fa3a09ea42c05ad7d9d484aab7a5b8ec64eb':
When long pressing to add a bookmark, use the title text returned from WebCore to populate the title field of the add bookmark dialog.
Ben Murdoch [Thu, 19 Nov 2009 12:58:26 +0000 (04:58 -0800)]
am
90d088ca: When long pressing to add a bookmark, use the title text returned from WebCore to populate the title field of the add bookmark dialog.
Merge commit '
90d088caeee718f89755ee9c25249ba6da15ab97' into eclair-mr2-plus-aosp
* commit '
90d088caeee718f89755ee9c25249ba6da15ab97':
When long pressing to add a bookmark, use the title text returned from WebCore to populate the title field of the add bookmark dialog.
Ben Murdoch [Tue, 17 Nov 2009 18:14:04 +0000 (18:14 +0000)]
When long pressing to add a bookmark, use the title text returned from WebCore to populate the title field of the add bookmark dialog.
Change-Id: Ia8991d3300776e81d5a216f7c467e7c9319a70d7
Dan Egnor [Wed, 18 Nov 2009 21:19:58 +0000 (13:19 -0800)]
am
79ba087a: am
221be506: Merge change I5ee906c0 into eclair-mr2
Merge commit '
79ba087a5013e03ee5e0ab836db0a1a1b7419c96'
* commit '
79ba087a5013e03ee5e0ab836db0a1a1b7419c96':
Change android.text.util.Regex to com.android.common.Patterns
Dan Egnor [Wed, 18 Nov 2009 21:07:39 +0000 (13:07 -0800)]
am
221be506: Merge change I5ee906c0 into eclair-mr2
Merge commit '
221be5066900fd6481570d6782e905bb2ad4e556' into eclair-mr2-plus-aosp
* commit '
221be5066900fd6481570d6782e905bb2ad4e556':
Change android.text.util.Regex to com.android.common.Patterns
Android (Google) Code Review [Wed, 18 Nov 2009 20:41:19 +0000 (12:41 -0800)]
Merge change I5ee906c0 into eclair-mr2
* changes:
Change android.text.util.Regex to com.android.common.Patterns
Dan Egnor [Wed, 18 Nov 2009 20:11:49 +0000 (12:11 -0800)]
Change android.text.util.Regex to com.android.common.Patterns
Ben Murdoch [Wed, 18 Nov 2009 19:56:12 +0000 (11:56 -0800)]
am
f7f4798d: am
ca12cfa9: Do not attempt to parse javascript: bookmarks as URIs, as this often fails.
Merge commit '
f7f4798dd7c9d69ac7428b39d803beabd9d0b450'
* commit '
f7f4798dd7c9d69ac7428b39d803beabd9d0b450':
Do not attempt to parse javascript: bookmarks as URIs, as this often fails.
Ben Murdoch [Wed, 18 Nov 2009 19:46:14 +0000 (11:46 -0800)]
am
ca12cfa9: Do not attempt to parse javascript: bookmarks as URIs, as this often fails.
Merge commit '
ca12cfa98fdf995c4cf37f487a050d0d4fb261e0' into eclair-mr2-plus-aosp
* commit '
ca12cfa98fdf995c4cf37f487a050d0d4fb261e0':
Do not attempt to parse javascript: bookmarks as URIs, as this often fails.
Ben Murdoch [Tue, 17 Nov 2009 13:57:44 +0000 (13:57 +0000)]
Do not attempt to parse javascript: bookmarks as URIs, as this often fails.
Bug: http://b/
2261225
Change-Id: I3322a2326cdddd290d4c5b95cc87624631d47c00
Ben Murdoch [Tue, 27 Oct 2009 11:48:28 +0000 (11:48 +0000)]
Add an option to the long press on image menu to save that image as the home screen wallpaper.
See b/
2210111
Change-Id: I911633772358504f0e82fe940f9f2efc4ef403de
Jean-Baptiste Queru [Sun, 15 Nov 2009 23:04:35 +0000 (15:04 -0800)]
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:23 +0000 (14:55 -0800)]
merge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:06:36 +0000 (14:06 -0800)]
merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
Patrick Scott [Sun, 15 Nov 2009 21:16:38 +0000 (13:16 -0800)]
am
62b3950c: am
5b75cd02: Merge change I9861276c into eclair-mr2
Merge commit '
62b3950cdbcf29b85a9d248cdebfa856ad89f74c'
* commit '
62b3950cdbcf29b85a9d248cdebfa856ad89f74c':
Do not allow javascript to change window focus.
Eric Fischer [Sun, 15 Nov 2009 21:16:35 +0000 (13:16 -0800)]
am
41763862: (-s ours) am
925103a5: am
64278482: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
417638627d36a9f9a8a7f8b7420dd0e939f27db6'
* commit '
417638627d36a9f9a8a7f8b7420dd0e939f27db6':
Import revised translations. DO NOT MERGE
Patrick Scott [Sun, 15 Nov 2009 21:13:07 +0000 (13:13 -0800)]
am
5b75cd02: Merge change I9861276c into eclair-mr2
Merge commit '
5b75cd02aab6284ec115df8e12228303c2d1ce9d' into eclair-mr2-plus-aosp
* commit '
5b75cd02aab6284ec115df8e12228303c2d1ce9d':
Do not allow javascript to change window focus.
Eric Fischer [Sun, 15 Nov 2009 21:13:04 +0000 (13:13 -0800)]
am
925103a5: am
64278482: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
925103a5816f960dc24734cad1ba1374200f2031' into eclair-mr2-plus-aosp
* commit '
925103a5816f960dc24734cad1ba1374200f2031':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Sun, 15 Nov 2009 21:09:53 +0000 (13:09 -0800)]
Merge change I9861276c into eclair-mr2
* changes:
Do not allow javascript to change window focus.
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:06:42 +0000 (12:06 -0800)]
merge from eclair
Eric Fischer [Sat, 14 Nov 2009 01:46:04 +0000 (17:46 -0800)]
am
64278482: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
64278482f4df3591de4068b23307820f5e4aa930' into eclair-mr2
* commit '
64278482f4df3591de4068b23307820f5e4aa930':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:45:26 +0000 (17:45 -0800)]
am
64278482: Import revised translations. DO NOT MERGE
Merge commit '
64278482f4df3591de4068b23307820f5e4aa930' into eclair-plus-aosp
* commit '
64278482f4df3591de4068b23307820f5e4aa930':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:15:10 +0000 (17:15 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Patrick Scott [Fri, 13 Nov 2009 20:09:42 +0000 (15:09 -0500)]
Do not allow javascript to change window focus.
Bug:
2161671
Eric Fischer [Fri, 13 Nov 2009 19:32:56 +0000 (11:32 -0800)]
am
0b7ecc0a: (-s ours) am
5c02feb6: am
80529427: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
0b7ecc0a2919ce86d73bca2fa0b946099be3f544'
* commit '
0b7ecc0a2919ce86d73bca2fa0b946099be3f544':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 19:00:00 +0000 (11:00 -0800)]
am
5c02feb6: am
80529427: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
5c02feb60b83550105d90cb988033cf238137218' into eclair-mr2-plus-aosp
* commit '
5c02feb60b83550105d90cb988033cf238137218':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 18:39:49 +0000 (10:39 -0800)]
am
80529427: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
8052942707767c853ef807facb2f4caeb5bd48b4' into eclair-mr2
* commit '
8052942707767c853ef807facb2f4caeb5bd48b4':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 18:38:16 +0000 (10:38 -0800)]
am
80529427: Import revised translations. DO NOT MERGE
Merge commit '
8052942707767c853ef807facb2f4caeb5bd48b4' into eclair-plus-aosp
* commit '
8052942707767c853ef807facb2f4caeb5bd48b4':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 13 Nov 2009 03:47:05 +0000 (19:47 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:46:07 +0000 (18:46 -0800)]
eclair snapshot
Ben Murdoch [Wed, 11 Nov 2009 00:17:52 +0000 (16:17 -0800)]
am
66a7091f: am
be9560db: Tidy up the website settings activity. This is mostly a cosmetic change. The only functional changes are to: 1) Not dismiss the site specific settings screen when a feature is removed if that site still has more features in use, and 2) Not us
Merge commit '
66a7091fad8778071b88896b6bae98f100e4bb60'
* commit '
66a7091fad8778071b88896b6bae98f100e4bb60':
Tidy up the website settings activity. This is mostly a cosmetic change. The only functional changes are to:
Ben Murdoch [Wed, 11 Nov 2009 00:14:11 +0000 (16:14 -0800)]
am
be9560db: Tidy up the website settings activity. This is mostly a cosmetic change. The only functional changes are to: 1) Not dismiss the site specific settings screen when a feature is removed if that site still has more features in use, and 2) Not use the title o
Merge commit '
be9560dbeb44338070170816b1ca45b2125b7ad9' into eclair-mr2-plus-aosp
* commit '
be9560dbeb44338070170816b1ca45b2125b7ad9':
Tidy up the website settings activity. This is mostly a cosmetic change. The only functional changes are to:
Ben Murdoch [Mon, 9 Nov 2009 17:52:21 +0000 (09:52 -0800)]
Tidy up the website settings activity. This is mostly a cosmetic change. The only functional changes are to:
1) Not dismiss the site specific settings screen when a feature is removed if that site still has more features in use, and
2) Not use the title of the URL extracted from the bookmarks database to identify the site if that bookmark is not the root
of the origin. For example, if the user bookmarked www.google.com/foo, we do not use the title of that bookmark to
identify www.google.com in the WebsiteSettingsActivity. If they had www.google.com bookmarked, then we would use that
title in the WebsiteSettingsActivity.
Bug: b/
2252579
Change-Id: Ic4187987ae7ce40ba3678e00d0b9b848c122f380
Patrick Scott [Tue, 10 Nov 2009 19:16:15 +0000 (11:16 -0800)]
am
cf7acc5d: am
a74f6963: Do database access in the background thread to prevent ANR.
Merge commit '
cf7acc5ddbed3e291ed3eed3a01d2fd8d9bcd440'
* commit '
cf7acc5ddbed3e291ed3eed3a01d2fd8d9bcd440':
Do database access in the background thread to prevent ANR.
Patrick Scott [Tue, 10 Nov 2009 19:14:36 +0000 (11:14 -0800)]
am
a74f6963: Do database access in the background thread to prevent ANR.
Merge commit '
a74f6963e548b7552d25fc4f851360dc74248958' into eclair-mr2-plus-aosp
* commit '
a74f6963e548b7552d25fc4f851360dc74248958':
Do database access in the background thread to prevent ANR.
Patrick Scott [Tue, 10 Nov 2009 18:06:47 +0000 (13:06 -0500)]
Do database access in the background thread to prevent ANR.
Bug:
2222528
Eric Fischer [Sat, 7 Nov 2009 00:21:59 +0000 (16:21 -0800)]
am
974d87bb: (-s ours) am
16979464: Import revised translations. DO NOT MERGE
Merge commit '
974d87bbc60053f61b146ad097f40c0700f65cd5'
* commit '
974d87bbc60053f61b146ad097f40c0700f65cd5':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 7 Nov 2009 00:09:52 +0000 (16:09 -0800)]
am
16979464: Import revised translations. DO NOT MERGE
Merge commit '
16979464732074bf1784fa37b83794c8f5d05245' into eclair-mr2-plus-aosp
* commit '
16979464732074bf1784fa37b83794c8f5d05245':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 6 Nov 2009 23:26:15 +0000 (15:26 -0800)]
Import revised translations. DO NOT MERGE
Leon Scroggins [Fri, 6 Nov 2009 17:03:40 +0000 (09:03 -0800)]
am
c2dc2ff8: am
8cf8f682: Reset the progress when beginning to load a new page.
Merge commit '
c2dc2ff8c98e60d241ec63c49819c7abb9cef90e'
* commit '
c2dc2ff8c98e60d241ec63c49819c7abb9cef90e':
Reset the progress when beginning to load a new page.
Leon Scroggins [Fri, 6 Nov 2009 16:58:19 +0000 (08:58 -0800)]
am
8cf8f682: Reset the progress when beginning to load a new page.
Merge commit '
8cf8f682e90f004d4b8028d2f5b74f72c0cf4e19' into eclair-mr2-plus-aosp
* commit '
8cf8f682e90f004d4b8028d2f5b74f72c0cf4e19':
Reset the progress when beginning to load a new page.
Leon Scroggins [Wed, 4 Nov 2009 19:13:50 +0000 (11:13 -0800)]
Reset the progress when beginning to load a new page.
Fixes http://b/issue?id=
2233145
Eric Fischer [Fri, 30 Oct 2009 03:13:30 +0000 (20:13 -0700)]
am
a538e695: (-s ours) am
31b95e61: am
6d0860d6: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
a538e695cfeb943dd64ff33fc05bffa3b1488dbd'
* commit '
a538e695cfeb943dd64ff33fc05bffa3b1488dbd':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 30 Oct 2009 02:53:55 +0000 (19:53 -0700)]
am
31b95e61: am
6d0860d6: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
31b95e612f51afa9d0a2a80fe1b5b26f06339c46' into eclair-mr2-plus-aosp
* commit '
31b95e612f51afa9d0a2a80fe1b5b26f06339c46':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 30 Oct 2009 02:23:21 +0000 (19:23 -0700)]
am
6d0860d6: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
6d0860d6014985cab3de1c8e4cca8bfbfb5183ef' into eclair-mr2
* commit '
6d0860d6014985cab3de1c8e4cca8bfbfb5183ef':
Import revised translations. DO NOT MERGE
Leon Scroggins [Thu, 29 Oct 2009 17:12:18 +0000 (10:12 -0700)]
am
d82bfc02: am
fb7c7506: Do not clear FindDialog\'s text when changing orientation.
Merge commit '
d82bfc027a374e162ec8e8857be25a502ecf4350'
* commit '
d82bfc027a374e162ec8e8857be25a502ecf4350':
Do not clear FindDialog's text when changing orientation.
Leon Scroggins [Thu, 29 Oct 2009 17:07:01 +0000 (10:07 -0700)]
am
fb7c7506: Do not clear FindDialog\'s text when changing orientation.
Merge commit '
fb7c75067fe5764631c762a095012bb6aed77521' into eclair-mr2-plus-aosp
* commit '
fb7c75067fe5764631c762a095012bb6aed77521':
Do not clear FindDialog's text when changing orientation.
Leon Scroggins [Thu, 29 Oct 2009 13:49:57 +0000 (09:49 -0400)]
Do not clear FindDialog's text when changing orientation.
Fix for http://b/issue?id=
1468517
Due to some changes in external/webkit and frameworks/base, it is
no longer necessary to clear the string. A message will be sent
which will perform the search one the picture is up to date.
Ben Murdoch [Thu, 29 Oct 2009 06:43:22 +0000 (23:43 -0700)]
am
4681d34a: am
9907efcd: When displaying a bookmark item, only truncate the Strings that we display in the ListView rather than the ones used to index into the bookmarks database. This caused a crash when bookmarks had titles longer than the text view limit.
Merge commit '
4681d34a0101619d227aef028b1e2cb36507d8be'
* commit '
4681d34a0101619d227aef028b1e2cb36507d8be':
When displaying a bookmark item, only truncate the Strings that we display in the ListView rather than the ones used to index into the bookmarks database. This caused a crash when bookmarks had titles longer than the text view limit.
Eric Fischer [Thu, 29 Oct 2009 06:33:33 +0000 (23:33 -0700)]
am
6d0860d6: Import revised translations. DO NOT MERGE
Merge commit '
6d0860d6014985cab3de1c8e4cca8bfbfb5183ef' into eclair-plus-aosp
* commit '
6d0860d6014985cab3de1c8e4cca8bfbfb5183ef':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 29 Oct 2009 04:17:37 +0000 (21:17 -0700)]
Import revised translations. DO NOT MERGE
Ben Murdoch [Wed, 28 Oct 2009 15:33:39 +0000 (08:33 -0700)]
am
9907efcd: When displaying a bookmark item, only truncate the Strings that we display in the ListView rather than the ones used to index into the bookmarks database. This caused a crash when bookmarks had titles longer than the text view limit.
Merge commit '
9907efcdb03d1e038b3923d6c58f907b1fda4c5e' into eclair-mr2-plus-aosp
* commit '
9907efcdb03d1e038b3923d6c58f907b1fda4c5e':
When displaying a bookmark item, only truncate the Strings that we display in the ListView rather than the ones used to index into the bookmarks database. This caused a crash when bookmarks had titles longer than the text view limit.
Ben Murdoch [Wed, 28 Oct 2009 13:22:46 +0000 (13:22 +0000)]
When displaying a bookmark item, only truncate the Strings that we display in the ListView rather than the ones used to index into the bookmarks database. This caused a crash when bookmarks had titles longer than the text view limit.
Fix for b/
2219781
Change-Id: I4ea3cdfbaedce0dea6bd69f560aae9aea71ed7c1
Ben Murdoch [Tue, 27 Oct 2009 12:40:33 +0000 (05:40 -0700)]
am
dedb65f6: am
ae59c3f5: Stretch short landscape bookmark screenshots to fill the correct amount of space.
Merge commit '
dedb65f6a0ed8141d1114a213556fd01529e0b72'
* commit '
dedb65f6a0ed8141d1114a213556fd01529e0b72':
Stretch short landscape bookmark screenshots to fill the correct amount of space.
Ben Murdoch [Tue, 27 Oct 2009 12:35:32 +0000 (05:35 -0700)]
am
ae59c3f5: Stretch short landscape bookmark screenshots to fill the correct amount of space.
Merge commit '
ae59c3f5a5b492f91d72e1d26702a13b91a43fa4' into eclair-mr2-plus-aosp
* commit '
ae59c3f5a5b492f91d72e1d26702a13b91a43fa4':
Stretch short landscape bookmark screenshots to fill the correct amount of space.
Ben Murdoch [Tue, 27 Oct 2009 12:30:36 +0000 (05:30 -0700)]
am
4abbaab3: am
9e19e44f: Remove the "clear all" menu option when you are in the website settings activity and are looking at the settings for a specific site rather than the overview of all sites.
Merge commit '
4abbaab374eba11c08512d3d91ab02fd28d46ea8'
* commit '
4abbaab374eba11c08512d3d91ab02fd28d46ea8':
Remove the "clear all" menu option when you are in the website settings activity and are looking at the settings for a specific site rather than the overview of all sites.
Ben Murdoch [Tue, 20 Oct 2009 17:30:28 +0000 (18:30 +0100)]
Stretch short landscape bookmark screenshots to fill the correct amount of space.
Change-Id: Iea18faab7ef08ace675e19c1047d15a39f12ec97
(cherry picked from commit
85b59baf17a443e6d89aed50d77149513ceb526c)
Ben Murdoch [Tue, 27 Oct 2009 12:25:32 +0000 (05:25 -0700)]
am
9e19e44f: Remove the "clear all" menu option when you are in the website settings activity and are looking at the settings for a specific site rather than the overview of all sites.
Merge commit '
9e19e44f0b27f12cd07913548c23a885d822e716' into eclair-mr2-plus-aosp
* commit '
9e19e44f0b27f12cd07913548c23a885d822e716':
Remove the "clear all" menu option when you are in the website settings activity and are looking at the settings for a specific site rather than the overview of all sites.
Ben Murdoch [Mon, 26 Oct 2009 18:03:44 +0000 (18:03 +0000)]
Remove the "clear all" menu option when you are in the website settings activity and are looking at the settings for a specific site rather than the overview of all sites.
Change-Id: Ic31677187ef0befe144168400732c760ebe73f8b
Robert Greenwalt [Fri, 23 Oct 2009 18:39:00 +0000 (11:39 -0700)]
am
a6162521: am
512920d4: am
7d899d6f: Fix how browser determines if it has connectivity.
Merge commit '
a6162521ab35ce640d04d6b34f082edf9644951c'
* commit '
a6162521ab35ce640d04d6b34f082edf9644951c':
Fix how browser determines if it has connectivity.
Robert Greenwalt [Fri, 23 Oct 2009 18:33:20 +0000 (11:33 -0700)]
am
512920d4: am
7d899d6f: Fix how browser determines if it has connectivity.
Merge commit '
512920d4c7c02c90dcbc27c0f7f33d53fb636dcf' into eclair-mr2-plus-aosp
* commit '
512920d4c7c02c90dcbc27c0f7f33d53fb636dcf':
Fix how browser determines if it has connectivity.
Robert Greenwalt [Fri, 23 Oct 2009 18:27:55 +0000 (11:27 -0700)]
am
7d899d6f: Fix how browser determines if it has connectivity.
Merge commit '
7d899d6f5364a5b20716497a3be5e2f778a2bc0e' into eclair-mr2
* commit '
7d899d6f5364a5b20716497a3be5e2f778a2bc0e':
Fix how browser determines if it has connectivity.
Robert Greenwalt [Fri, 23 Oct 2009 18:27:40 +0000 (11:27 -0700)]
am
7d899d6f: Fix how browser determines if it has connectivity.
Merge commit '
7d899d6f5364a5b20716497a3be5e2f778a2bc0e' into eclair-plus-aosp
* commit '
7d899d6f5364a5b20716497a3be5e2f778a2bc0e':
Fix how browser determines if it has connectivity.
Robert Greenwalt [Fri, 23 Oct 2009 17:33:48 +0000 (10:33 -0700)]
Fix how browser determines if it has connectivity.
Rather than use the connectedness of the last network type to report status
we should use the EXTRA_NO_CONNECTIVITY info included with each status report
to see if there is any network connectivity.
bug:
2203128
Eric Fischer [Thu, 22 Oct 2009 16:46:28 +0000 (09:46 -0700)]
am
b0178921: (-s ours) am
d2bca5c6: am
9c50b60c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
b0178921bd8b95f35ddec754b6022424b356cd7d'
* commit '
b0178921bd8b95f35ddec754b6022424b356cd7d':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 16:34:12 +0000 (09:34 -0700)]
am
d2bca5c6: am
9c50b60c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
d2bca5c6e24bfff6d8fdda45e3265d50f6e28001' into eclair-mr2-plus-aosp
* commit '
d2bca5c6e24bfff6d8fdda45e3265d50f6e28001':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 13:46:22 +0000 (06:46 -0700)]
am
9c50b60c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9c50b60c4b6d6caa164ca198ffb0c2ec3781a661' into eclair-mr2
* commit '
9c50b60c4b6d6caa164ca198ffb0c2ec3781a661':
Import revised translations. DO NOT MERGE
Grace Kloba [Wed, 21 Oct 2009 20:59:36 +0000 (13:59 -0700)]
am
c9ad822e: am
1fc98a32: Remove the fake title bar in onDestroy so that we will not leak the window.
Merge commit '
c9ad822edbb5878d28c36954e021dae9dd4bd5c2'
* commit '
c9ad822edbb5878d28c36954e021dae9dd4bd5c2':
Remove the fake title bar in onDestroy so that we will
Grace Kloba [Wed, 21 Oct 2009 20:43:45 +0000 (13:43 -0700)]
am
1fc98a32: Remove the fake title bar in onDestroy so that we will not leak the window.
Merge commit '
1fc98a322e9df6b0e797c26de6b2cb23d69ad5d3' into eclair-mr2-plus-aosp
* commit '
1fc98a322e9df6b0e797c26de6b2cb23d69ad5d3':
Remove the fake title bar in onDestroy so that we will
Grace Kloba [Wed, 21 Oct 2009 20:23:08 +0000 (13:23 -0700)]
Remove the fake title bar in onDestroy so that we will
not leak the window.
Fix http://b/issue?id=
2198565
Eric Fischer [Wed, 21 Oct 2009 19:15:23 +0000 (12:15 -0700)]
am
9c50b60c: Import revised translations. DO NOT MERGE
Merge commit '
9c50b60c4b6d6caa164ca198ffb0c2ec3781a661' into eclair-plus-aosp
* commit '
9c50b60c4b6d6caa164ca198ffb0c2ec3781a661':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 17:42:51 +0000 (10:42 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Steve Block [Wed, 21 Oct 2009 11:52:23 +0000 (04:52 -0700)]
am
16231806: am
aed8c32e: Merge change Ie806375b into eclair-mr2
Merge commit '
162318062c74428efc454078acfb21a37c279c13'
* commit '
162318062c74428efc454078acfb21a37c279c13':
Adds toast for Geolocation permissions prompt.
Steve Block [Wed, 21 Oct 2009 11:41:44 +0000 (04:41 -0700)]
am
aed8c32e: Merge change Ie806375b into eclair-mr2
Merge commit '
aed8c32e130fbd53349b1309734885262e3e552c' into eclair-mr2-plus-aosp
* commit '
aed8c32e130fbd53349b1309734885262e3e552c':
Adds toast for Geolocation permissions prompt.
Android (Google) Code Review [Wed, 21 Oct 2009 11:33:05 +0000 (07:33 -0400)]
Merge change Ie806375b into eclair-mr2
* changes:
Adds toast for Geolocation permissions prompt.
Steve Block [Fri, 16 Oct 2009 17:19:08 +0000 (18:19 +0100)]
Adds toast for Geolocation permissions prompt.
This fixes bug http://b/issue?id=
2076246
Change-Id: Ie806375b22809c47a36ea5cff5699d82e9ee4dfb
Andrei Popescu [Tue, 20 Oct 2009 17:19:09 +0000 (10:19 -0700)]
am
ec04dc74: am
163ab74e: Hide the status bar while a <video> is playing.
Merge commit '
ec04dc74d25b8a47b23cc837c61508f429cbc77b'
* commit '
ec04dc74d25b8a47b23cc837c61508f429cbc77b':
Hide the status bar while a <video> is playing.
Andrei Popescu [Tue, 20 Oct 2009 17:13:49 +0000 (10:13 -0700)]
am
163ab74e: Hide the status bar while a <video> is playing.
Merge commit '
163ab74e2f85b53a1a374c49677073fb64d35f28' into eclair-mr2-plus-aosp
* commit '
163ab74e2f85b53a1a374c49677073fb64d35f28':
Hide the status bar while a <video> is playing.
Andrei Popescu [Tue, 20 Oct 2009 16:58:23 +0000 (17:58 +0100)]
Hide the status bar while a <video> is playing.
Fixes http://b/issue?id=
2200379
Leon Scroggins [Fri, 16 Oct 2009 16:11:35 +0000 (09:11 -0700)]
am
03160558: am
badcfad8: am
b3968bbc: Disable thumbnail view mode for most visited page.
Merge commit '
03160558d2b3d4d5f2248be7f59264f26f790b29'
* commit '
03160558d2b3d4d5f2248be7f59264f26f790b29':
Disable thumbnail view mode for most visited page.
Leon Scroggins [Fri, 16 Oct 2009 16:06:35 +0000 (09:06 -0700)]
am
badcfad8: am
b3968bbc: Disable thumbnail view mode for most visited page.
Merge commit '
badcfad83c548a20fc82a5b5ca195a2baacbd6d5' into eclair-mr2-plus-aosp
* commit '
badcfad83c548a20fc82a5b5ca195a2baacbd6d5':
Disable thumbnail view mode for most visited page.
Leon Scroggins [Fri, 16 Oct 2009 16:03:26 +0000 (09:03 -0700)]
am
b3968bbc: Disable thumbnail view mode for most visited page.
Merge commit '
b3968bbcc96450d45bae2a667cf5ff884070fb10' into eclair-plus-aosp
* commit '
b3968bbcc96450d45bae2a667cf5ff884070fb10':
Disable thumbnail view mode for most visited page.
Leon Scroggins [Fri, 16 Oct 2009 15:59:57 +0000 (08:59 -0700)]
am
b3968bbc: Disable thumbnail view mode for most visited page.
Merge commit '
b3968bbcc96450d45bae2a667cf5ff884070fb10' into eclair-mr2
* commit '
b3968bbcc96450d45bae2a667cf5ff884070fb10':
Disable thumbnail view mode for most visited page.
Leon Scroggins [Fri, 16 Oct 2009 13:04:16 +0000 (09:04 -0400)]
Disable thumbnail view mode for most visited page.
Fix http://b/issue?id=
2191540
Ben Murdoch [Wed, 14 Oct 2009 10:20:21 +0000 (03:20 -0700)]
am
faf8b399: am
de353621: Don\'t allow the user to save bookmarks with a scheme that the Browser cannot directly handle.
Merge commit '
faf8b399f550c05f77de0297f8a6fb55d2fe9b2a'
* commit '
faf8b399f550c05f77de0297f8a6fb55d2fe9b2a':
Don't allow the user to save bookmarks with a scheme that the Browser cannot directly handle.
Ben Murdoch [Wed, 14 Oct 2009 10:12:11 +0000 (03:12 -0700)]
am
de353621: Don\'t allow the user to save bookmarks with a scheme that the Browser cannot directly handle.
Merge commit '
de353621650d17a412b6ffe2cbf0366db5f11c40' into eclair-mr2-plus-aosp
* commit '
de353621650d17a412b6ffe2cbf0366db5f11c40':
Don't allow the user to save bookmarks with a scheme that the Browser cannot directly handle.
Ben Murdoch [Mon, 12 Oct 2009 09:29:00 +0000 (10:29 +0100)]
Don't allow the user to save bookmarks with a scheme that the Browser cannot directly handle.
Change-Id: I9cbdfeaaeef4ded3dac1623854ecb9c5c603eb91