OSDN Git Service
Leon Scroggins [Tue, 12 Jan 2010 15:10:35 +0000 (07:10 -0800)]
am
c7b92f81: Use a "boolean" instead of a "Boolean"
Merge commit '
c7b92f811dfa3572578ddc6714c98a03936d9ce5' into eclair-mr2-plus-aosp
* commit '
c7b92f811dfa3572578ddc6714c98a03936d9ce5':
Use a "boolean" instead of a "Boolean"
Leon Scroggins [Mon, 11 Jan 2010 23:17:31 +0000 (18:17 -0500)]
Use a "boolean" instead of a "Boolean"
Fixes http://b/issue?id=
1856681
Leon Scroggins [Mon, 11 Jan 2010 18:17:09 +0000 (10:17 -0800)]
am
fde9746a: Clear parent/child tab relationships when clearing history.
Merge commit '
fde9746ac3055848e110c35f19ec5893c621f766' into eclair-mr2-plus-aosp
* commit '
fde9746ac3055848e110c35f19ec5893c621f766':
Clear parent/child tab relationships when clearing history.
Leon Scroggins [Mon, 11 Jan 2010 18:06:21 +0000 (13:06 -0500)]
Clear parent/child tab relationships when clearing history.
Fixes http://b/issue?id=
2330279
Leon Scroggins [Mon, 4 Jan 2010 21:37:38 +0000 (13:37 -0800)]
am
02065b07: Save to database in non UI thread.
Merge commit '
02065b07aea6b4392c344a4172c3ab56019225ed' into eclair-mr2-plus-aosp
* commit '
02065b07aea6b4392c344a4172c3ab56019225ed':
Save to database in non UI thread.
Leon Scroggins [Mon, 4 Jan 2010 19:30:13 +0000 (14:30 -0500)]
Save to database in non UI thread.
Work to prevent ANR reported in http://b/issue?id=
2322540 category 1.
Derek Sollenberger [Fri, 18 Dec 2009 17:56:06 +0000 (09:56 -0800)]
am
3b2b810a: Merge change Ife7f3f54 into eclair-mr2
Merge commit '
3b2b810a099b7bce65d18fc2a21ae17d78488eb0' into eclair-mr2-plus-aosp
* commit '
3b2b810a099b7bce65d18fc2a21ae17d78488eb0':
Explicitly requesting that the IME resize the WebView.
Mike Reed [Fri, 18 Dec 2009 17:53:11 +0000 (09:53 -0800)]
am
d5a80a52: add initial dragtrackers
Merge commit '
d5a80a5295438be18cfaebf197088d7c15f6d0ba' into eclair-mr2-plus-aosp
* commit '
d5a80a5295438be18cfaebf197088d7c15f6d0ba':
add initial dragtrackers
Android (Google) Code Review [Fri, 18 Dec 2009 17:53:04 +0000 (09:53 -0800)]
Merge change Ife7f3f54 into eclair-mr2
* changes:
Explicitly requesting that the IME resize the WebView.
Derek Sollenberger [Fri, 18 Dec 2009 13:59:22 +0000 (08:59 -0500)]
Explicitly requesting that the IME resize the WebView.
Mike Reed [Thu, 12 Nov 2009 17:49:34 +0000 (12:49 -0500)]
add initial dragtrackers
deleted: src/com/android/browser/TestTracker.java
Paul Westbrook [Mon, 14 Dec 2009 18:37:55 +0000 (10:37 -0800)]
am
c6343adf: Changed class paths for classes moved in unbundling effort
Merge commit '
c6343adff2abb5ae8ec2cc7ba613dd7e48ba7e9a' into eclair-mr2-plus-aosp
* commit '
c6343adff2abb5ae8ec2cc7ba613dd7e48ba7e9a':
Changed class paths for classes moved in unbundling effort
Paul Westbrook [Fri, 11 Dec 2009 23:35:38 +0000 (15:35 -0800)]
Changed class paths for classes moved in unbundling effort
Derek Sollenberger [Mon, 14 Dec 2009 15:29:53 +0000 (07:29 -0800)]
am
c06a2da3: Merge change I4c7be8c7 into eclair-mr2
Merge commit '
c06a2da38a76eac4221f47cf17fccb27dc757fed' into eclair-mr2-plus-aosp
* commit '
c06a2da38a76eac4221f47cf17fccb27dc757fed':
Notify the WebView that its customView is not being displayed instead of failing silently.
Patrick Scott [Mon, 14 Dec 2009 15:29:37 +0000 (07:29 -0800)]
am
49b11f97: Fix a monkey crash by pretending to be a real adapter.
Merge commit '
49b11f97360fea3bb37fc5cc3703587deaf32f00' into eclair-mr2-plus-aosp
* commit '
49b11f97360fea3bb37fc5cc3703587deaf32f00':
Fix a monkey crash by pretending to be a real adapter.
Android (Google) Code Review [Mon, 14 Dec 2009 15:12:22 +0000 (07:12 -0800)]
Merge change I4c7be8c7 into eclair-mr2
* changes:
Notify the WebView that its customView is not being displayed instead of failing silently.
Derek Sollenberger [Tue, 8 Dec 2009 20:39:55 +0000 (15:39 -0500)]
Notify the WebView that its customView is not being displayed instead of failing silently.
Patrick Scott [Mon, 14 Dec 2009 14:32:13 +0000 (09:32 -0500)]
Fix a monkey crash by pretending to be a real adapter.
The monkey could generate this crash by sending a touch event to the view after
a tab was removed from TabControl (somehow). Use notifyDataSetChanged() to be a
better adapter. If we did not call notifyDataSetChanged and getCount() will
return something different, return the old count and post a message to update
the adapter.
Bug:
2307928
Eric Fischer [Fri, 11 Dec 2009 01:52:35 +0000 (17:52 -0800)]
am
531ffb58: am
9c1d7d01: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
531ffb589684e215a683a8ef16fc118b6904053a' into eclair-mr2-plus-aosp
* commit '
531ffb589684e215a683a8ef16fc118b6904053a':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 11 Dec 2009 01:42:22 +0000 (17:42 -0800)]
am
9c1d7d01: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9c1d7d017787b73bf4737465fbaf07a07c0f545e' into eclair-mr2
* commit '
9c1d7d017787b73bf4737465fbaf07a07c0f545e':
Import revised translations. DO NOT MERGE
Leon Scroggins [Thu, 10 Dec 2009 22:05:08 +0000 (14:05 -0800)]
am
d530494d: Provide a button to allow the user to set the home page to the current page.
Merge commit '
d530494de9c182af4aff97ddd46343b32594da51' into eclair-mr2-plus-aosp
* commit '
d530494de9c182af4aff97ddd46343b32594da51':
Provide a button to allow the user to set the home page to the current page.
Leon Scroggins [Thu, 10 Dec 2009 21:11:39 +0000 (16:11 -0500)]
Provide a button to allow the user to set the home page to the current page.
Fixes http://b/issue?id=
2243560
Eric Fischer [Thu, 10 Dec 2009 01:24:39 +0000 (17:24 -0800)]
Import revised translations. DO NOT MERGE
Leon Scroggins [Wed, 9 Dec 2009 23:45:33 +0000 (15:45 -0800)]
am
4e67a2a4: Merge change I22807d19 into eclair-mr2
Merge commit '
4e67a2a46507299a1aa8f2b94c33c3f65e5f78e2' into eclair-mr2-plus-aosp
* commit '
4e67a2a46507299a1aa8f2b94c33c3f65e5f78e2':
Do not use the Cursor if it is closed.
Leon Scroggins [Wed, 9 Dec 2009 23:45:30 +0000 (15:45 -0800)]
am
a143bfea: Merge change If65b50dd into eclair-mr2
Merge commit '
a143bfea09ddb6a9a909773ace362cbc380e857a' into eclair-mr2-plus-aosp
* commit '
a143bfea09ddb6a9a909773ace362cbc380e857a':
Allow long press MENU to open IME in Browser.
Derek Sollenberger [Wed, 9 Dec 2009 23:44:08 +0000 (15:44 -0800)]
am
100a4f32: Cleaning up unused plugin declarations from the manifest.
Merge commit '
100a4f32c017c69938e4a5602c341130c8d1f4ce' into eclair-mr2-plus-aosp
* commit '
100a4f32c017c69938e4a5602c341130c8d1f4ce':
Cleaning up unused plugin declarations from the manifest.
Android (Google) Code Review [Tue, 8 Dec 2009 16:21:44 +0000 (08:21 -0800)]
Merge change I22807d19 into eclair-mr2
* changes:
Do not use the Cursor if it is closed.
Android (Google) Code Review [Tue, 8 Dec 2009 16:18:22 +0000 (08:18 -0800)]
Merge change If65b50dd into eclair-mr2
* changes:
Allow long press MENU to open IME in Browser.
Leon Scroggins [Tue, 8 Dec 2009 16:15:36 +0000 (11:15 -0500)]
Do not use the Cursor if it is closed.
Fixes http://b/issue?id=
2307930
Leon Scroggins [Tue, 8 Dec 2009 15:44:28 +0000 (10:44 -0500)]
Allow long press MENU to open IME in Browser.
Pass MENU key up even if menu is already held down so the
IME can open due to long press.
Fixes http://b/issue?id=
20306904
Derek Sollenberger [Mon, 7 Dec 2009 20:36:44 +0000 (15:36 -0500)]
Cleaning up unused plugin declarations from the manifest.
Bjorn Bringert [Sat, 5 Dec 2009 18:25:55 +0000 (10:25 -0800)]
am
80a56269: Merge change Ie2888363 into eclair-mr2
Merge commit '
80a56269482dcc071e1b413baf968509bd9da9fb' into eclair-mr2-plus-aosp
* commit '
80a56269482dcc071e1b413baf968509bd9da9fb':
Change SearchableInfo import
Android (Google) Code Review [Sat, 5 Dec 2009 18:21:14 +0000 (10:21 -0800)]
Merge change Ie2888363 into eclair-mr2
* changes:
Change SearchableInfo import
Bjorn Bringert [Fri, 4 Dec 2009 12:59:14 +0000 (12:59 +0000)]
Change SearchableInfo import
SearchableInfo has moved from android.server.search to
android.app.
This is part of http://b/issue?id=
2270838
Change-Id: Ie2888363484b24b08715e5959a873e5fa59722f9
Eric Fischer [Wed, 2 Dec 2009 23:15:41 +0000 (15:15 -0800)]
am
8efa766c: am
1852d75b: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
8efa766c1a25e180fe5645e272a4185af8b31d60' into eclair-mr2-plus-aosp
* commit '
8efa766c1a25e180fe5645e272a4185af8b31d60':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 23:07:53 +0000 (15:07 -0800)]
am
1852d75b: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
1852d75be4a4a36b8881c57bcc28a48ebac7d0fb' into eclair-mr2
* commit '
1852d75be4a4a36b8881c57bcc28a48ebac7d0fb':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 22:55:38 +0000 (14:55 -0800)]
Import revised translations. DO NOT MERGE
Grace Kloba [Wed, 2 Dec 2009 19:54:01 +0000 (11:54 -0800)]
am
9804c433: Change the Browser Cached Page capacity.
Merge commit '
9804c433f5c73877e3b529eeee0e60d5395014e7' into eclair-mr2-plus-aosp
* commit '
9804c433f5c73877e3b529eeee0e60d5395014e7':
Change the Browser Cached Page capacity.
Grace Kloba [Wed, 2 Dec 2009 19:53:57 +0000 (11:53 -0800)]
am
79565031: Set pageCacheCapacity, which enables page cache, for the Browser
Merge commit '
79565031293b4cdfd3e7a0bf9f0ead59b8570bba' into eclair-mr2-plus-aosp
* commit '
79565031293b4cdfd3e7a0bf9f0ead59b8570bba':
Set pageCacheCapacity, which enables page cache,
Grace Kloba [Wed, 2 Dec 2009 19:07:40 +0000 (11:07 -0800)]
Change the Browser Cached Page capacity.
Grace Kloba [Tue, 24 Nov 2009 22:23:39 +0000 (14:23 -0800)]
Set pageCacheCapacity, which enables page cache,
for the Browser
http://b/issue?id=
2284168
Eric Fischer [Wed, 2 Dec 2009 01:29:00 +0000 (17:29 -0800)]
am
2377db31: am
8f461425: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
2377db31be52b2292883376c41cd4f983f945c6a' into eclair-mr2-plus-aosp
* commit '
2377db31be52b2292883376c41cd4f983f945c6a':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 01:06:29 +0000 (17:06 -0800)]
am
8f461425: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
8f4614259d5127bd9ba5774996b75219cced78e8' into eclair-mr2
* commit '
8f4614259d5127bd9ba5774996b75219cced78e8':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 30 Nov 2009 19:34:58 +0000 (11:34 -0800)]
Import revised translations. DO NOT MERGE
Leon Scroggins [Fri, 27 Nov 2009 18:10:11 +0000 (10:10 -0800)]
am
b446443e: Only show manually entered URLs in suggestions.
Merge commit '
b446443e47c334bc3aaae98b67c8dca347da3032' into eclair-mr2-plus-aosp
* commit '
b446443e47c334bc3aaae98b67c8dca347da3032':
Only show manually entered URLs in suggestions.
Leon Scroggins [Wed, 25 Nov 2009 17:37:50 +0000 (12:37 -0500)]
Only show manually entered URLs in suggestions.
In the bookmarks database, add a column to keep track of whether
the url was entered by the user. When providing a Cursor for
suggestions, do not show visited websites that were not entered
by the user. In BrowserActivity, add manually entered urls to
the database, so that they can be seen in the suggestons.
Requires a change to frameworks/base.
Fixes http://b/issue?id=
2281371
Ben Murdoch [Wed, 25 Nov 2009 10:48:20 +0000 (02:48 -0800)]
am
3f355eae: am
c44c7a6b: (-s ours) Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes. Do not merge.
Merge commit '
3f355eaeadda57d67d7a44cc1e769065f078220b' into eclair-mr2-plus-aosp
* commit '
3f355eaeadda57d67d7a44cc1e769065f078220b':
Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes. Do not merge.
Steve Block [Wed, 25 Nov 2009 10:48:17 +0000 (02:48 -0800)]
am
743cd9fc: am
164657ef: (-s ours) Adds an explicit type for GeolocationPermissions.getOrigins. Do not merge.
Merge commit '
743cd9fcb1d94c19dba5febcd7867789ce8c5db1' into eclair-mr2-plus-aosp
* commit '
743cd9fcb1d94c19dba5febcd7867789ce8c5db1':
Adds an explicit type for GeolocationPermissions.getOrigins. Do not merge.
Ben Murdoch [Wed, 25 Nov 2009 10:43:04 +0000 (02:43 -0800)]
am
c44c7a6b: (-s ours) Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes. Do not merge.
Merge commit '
c44c7a6b4e98f9c7674165e547330c17075a3c55' into eclair-mr2
* commit '
c44c7a6b4e98f9c7674165e547330c17075a3c55':
Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes. Do not merge.
Steve Block [Wed, 25 Nov 2009 10:43:00 +0000 (02:43 -0800)]
am
164657ef: (-s ours) Adds an explicit type for GeolocationPermissions.getOrigins. Do not merge.
Merge commit '
164657efe67e7d2ce02ec8804d04dd485f91a098' into eclair-mr2
* commit '
164657efe67e7d2ce02ec8804d04dd485f91a098':
Adds an explicit type for GeolocationPermissions.getOrigins. Do not merge.
Leon Scroggins [Tue, 24 Nov 2009 20:55:53 +0000 (12:55 -0800)]
am
ea00257e: Pass a message to query the database, rather than doing it in onCreate.
Merge commit '
ea00257e871d42afa0639b5e272237957bdbfbdf' into eclair-mr2-plus-aosp
* commit '
ea00257e871d42afa0639b5e272237957bdbfbdf':
Pass a message to query the database, rather than doing it in onCreate.
Leon Scroggins [Tue, 24 Nov 2009 20:21:18 +0000 (15:21 -0500)]
Pass a message to query the database, rather than doing it in onCreate.
Creating a BrowserBookmarksAdapter queries the database. Rather than
doing it in onCreate, which may slow down opening the bookmarks page,
pass a message to do it.
Ben Murdoch [Thu, 19 Nov 2009 18:16:04 +0000 (18:16 +0000)]
Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes. Do not merge.
BUG=
2271636
This has already been submitted to eclair-mr2.
Change-Id: I906f945120fe1311be01c6aa170105a8effcc56e
Steve Block [Thu, 19 Nov 2009 15:55:42 +0000 (15:55 +0000)]
Adds an explicit type for GeolocationPermissions.getOrigins. Do not merge.
BUG=
2271636
This has already been submitted to eclair-mr2.
Change-Id: I8c79b949162a98c3711f01d9c6ebbf53959fd039
Grace Kloba [Mon, 23 Nov 2009 20:11:53 +0000 (12:11 -0800)]
am
41d53ed1: Merge change I638d3f45 into eclair-mr2
Merge commit '
41d53ed121dbe8932065e099477a0bcb8aae5265' into eclair-mr2-plus-aosp
* commit '
41d53ed121dbe8932065e099477a0bcb8aae5265':
Enable some special debug url.
Android (Google) Code Review [Mon, 23 Nov 2009 20:07:41 +0000 (12:07 -0800)]
Merge change I638d3f45 into eclair-mr2
* changes:
Enable some special debug url.
Grace Kloba [Mon, 23 Nov 2009 18:35:04 +0000 (10:35 -0800)]
Enable some special debug url.
about.debug.dom -> dump the dom tree to adb log
about.debug.dom.tree -> dump the dom tree to /sdcard/domTree.txt
about.debug.render -> dump the render tree to adb log
about.debug.render.tree -> dump the render tree to /sdcard/renderTree.txt
about.debug.display -> dump the display tree to /sdcard/displayTree.txt
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 [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: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 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: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: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
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: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: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: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: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: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 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 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: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.