OSDN Git Service
Romain Guy [Fri, 8 Jan 2010 23:06:43 +0000 (15:06 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #
2361749.
Mike Reed [Fri, 8 Jan 2010 15:31:53 +0000 (10:31 -0500)]
enable drag-trackers via about:debug.dragN where N is
0: no tracker (default)
1: variant 1
2: variant 2
Patrick Scott [Fri, 8 Jan 2010 15:06:45 +0000 (10:06 -0500)]
Remove onTooManyRedirects as it is deprecated.
Patrick Scott [Thu, 7 Jan 2010 20:01:09 +0000 (15:01 -0500)]
Use LIKE rather than GLOB since the url contains '?'.
Bug:
2271388
Fred Quintana [Wed, 6 Jan 2010 20:51:39 +0000 (12:51 -0800)]
Merge "switch to using AccountManager instead of GLS"
Jean-Baptiste Queru [Wed, 6 Jan 2010 00:27:21 +0000 (16:27 -0800)]
Do not use a user tag on apps, as it is ignored.
The build system does not honor user tags on apps,
and setting it is misleading.
This removes the confusion by making the makefiles
behave like they read.
Change-Id: Iddc3da158364849efa59c02bac7d821dc12cf02f
Leon Scroggins [Mon, 4 Jan 2010 23:40:07 +0000 (15:40 -0800)]
am
4843fb8f: am
02065b07: Save to database in non UI thread.
Merge commit '
4843fb8fbc68b500a039d7e8fb21d73eeaa77baa'
* commit '
4843fb8fbc68b500a039d7e8fb21d73eeaa77baa':
Save to database in non UI thread.
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.
Fred Quintana [Fri, 18 Dec 2009 18:18:26 +0000 (10:18 -0800)]
switch to using AccountManager instead of GLS
Derek Sollenberger [Fri, 18 Dec 2009 17:59:15 +0000 (09:59 -0800)]
am
9f1a55b2: am
3b2b810a: Merge change Ife7f3f54 into eclair-mr2
Merge commit '
9f1a55b21d05acc91d25fb0ff77089491af68dd8'
* commit '
9f1a55b21d05acc91d25fb0ff77089491af68dd8':
Explicitly requesting that the IME resize the WebView.
Mike Reed [Fri, 18 Dec 2009 17:57:02 +0000 (09:57 -0800)]
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
Android Git Automerger [Tue, 15 Dec 2009 08:44:51 +0000 (00:44 -0800)]
Merge commit 'goog/eclair-plus-aosp'
Paul Westbrook [Mon, 14 Dec 2009 19:04:53 +0000 (11:04 -0800)]
am
a14a22f4: am
c6343adf: Changed class paths for classes moved in unbundling effort
Merge commit '
a14a22f479ea08b56c8abcc3b75b54f0d5f1e3f8'
* commit '
a14a22f479ea08b56c8abcc3b75b54f0d5f1e3f8':
Changed class paths for classes moved in unbundling effort
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:50:24 +0000 (07:50 -0800)]
am
3950d733: am
c06a2da3: Merge change I4c7be8c7 into eclair-mr2
Merge commit '
3950d733fad2f7cfd127ea26bf9c7a2a66623c33'
* commit '
3950d733fad2f7cfd127ea26bf9c7a2a66623c33':
Notify the WebView that its customView is not being displayed instead of failing silently.
Patrick Scott [Mon, 14 Dec 2009 15:50:13 +0000 (07:50 -0800)]
am
7fd68662: am
49b11f97: Fix a monkey crash by pretending to be a real adapter.
Merge commit '
7fd68662d80983776bcf1f0bb785b8e181f57eb6'
* commit '
7fd68662d80983776bcf1f0bb785b8e181f57eb6':
Fix a monkey crash by pretending to be a real adapter.
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 07:40:34 +0000 (23:40 -0800)]
am
da646ac6: (-s ours) am
531ffb58: am
9c1d7d01: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
da646ac63099afa684a845b8932b1d8b3043c6c2'
* commit '
da646ac63099afa684a845b8932b1d8b3043c6c2':
Import revised translations. DO NOT MERGE
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:43:09 +0000 (14:43 -0800)]
am
fb6549b9: am
d530494d: Provide a button to allow the user to set the home page to the current page.
Merge commit '
fb6549b93476f115b4aa1a14523d98e27366d3e6'
* commit '
fb6549b93476f115b4aa1a14523d98e27366d3e6':
Provide a button to allow the user to set the home page to the current page.
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
Leon Scroggins [Thu, 10 Dec 2009 14:57:34 +0000 (06:57 -0800)]
am
ae779592: am
4e67a2a4: Merge change I22807d19 into eclair-mr2
Merge commit '
ae77959253d69643ba0fc71647630cee880f3519'
* commit '
ae77959253d69643ba0fc71647630cee880f3519':
Do not use the Cursor if it is closed.
Leon Scroggins [Thu, 10 Dec 2009 14:57:30 +0000 (06:57 -0800)]
am
98f0d6db: am
a143bfea: Merge change If65b50dd into eclair-mr2
Merge commit '
98f0d6db63213c3107cb8f2e6ed649df73f4521f'
* commit '
98f0d6db63213c3107cb8f2e6ed649df73f4521f':
Allow long press MENU to open IME in Browser.
Derek Sollenberger [Thu, 10 Dec 2009 14:57:26 +0000 (06:57 -0800)]
am
387ffb97: am
100a4f32: Cleaning up unused plugin declarations from the manifest.
Merge commit '
387ffb97553ad872b5f9dce6a08ad68044086d91'
* commit '
387ffb97553ad872b5f9dce6a08ad68044086d91':
Cleaning up unused plugin declarations from the manifest.
Eric Fischer [Thu, 10 Dec 2009 02:06:35 +0000 (18:06 -0800)]
am
9c1d7d01: Import revised translations. DO NOT MERGE
Merge commit '
9c1d7d017787b73bf4737465fbaf07a07c0f545e' into eclair-plus-aosp
* commit '
9c1d7d017787b73bf4737465fbaf07a07c0f545e':
Import revised translations. DO NOT MERGE
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
Bjorn Bringert [Mon, 7 Dec 2009 22:58:17 +0000 (14:58 -0800)]
am
5ad0d55d: am
80a56269: Merge change Ie2888363 into eclair-mr2
Merge commit '
5ad0d55d4a24a92d51fa6675150b62ccf468789c'
* commit '
5ad0d55d4a24a92d51fa6675150b62ccf468789c':
Change SearchableInfo import
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 [Thu, 3 Dec 2009 04:39:26 +0000 (20:39 -0800)]
am
e05eb5c9: (-s ours) am
8efa766c: am
1852d75b: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
e05eb5c9777a2a93509a74556a12327c2c0ab889'
* commit '
e05eb5c9777a2a93509a74556a12327c2c0ab889':
Import revised translations. DO NOT MERGE
Grace Kloba [Thu, 3 Dec 2009 04:35:17 +0000 (20:35 -0800)]
am
7a953427: am
9804c433: Change the Browser Cached Page capacity.
Merge commit '
7a953427d0d96cfff79e2cda8c68fa0b7ac95b90'
* commit '
7a953427d0d96cfff79e2cda8c68fa0b7ac95b90':
Change the Browser Cached Page capacity.
Grace Kloba [Thu, 3 Dec 2009 04:35:13 +0000 (20:35 -0800)]
am
8f4d48ac: am
79565031: Set pageCacheCapacity, which enables page cache, for the Browser
Merge commit '
8f4d48acc9aad82af2202740f30fc5de711f1562'
* commit '
8f4d48acc9aad82af2202740f30fc5de711f1562':
Set pageCacheCapacity, which enables page cache,
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:08:40 +0000 (15:08 -0800)]
am
1852d75b: Import revised translations. DO NOT MERGE
Merge commit '
1852d75be4a4a36b8881c57bcc28a48ebac7d0fb' into eclair-plus-aosp
* commit '
1852d75be4a4a36b8881c57bcc28a48ebac7d0fb':
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:38:38 +0000 (17:38 -0800)]
am
7aacced8: (-s ours) am
2377db31: am
8f461425: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
7aacced8dbdf91289ba13f47ee0a5050dcb75bb4'
* commit '
7aacced8dbdf91289ba13f47ee0a5050dcb75bb4':
Import revised translations. DO NOT MERGE
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:59:49 +0000 (11:59 -0800)]
am
8f461425: Import revised translations. DO NOT MERGE
Merge commit '
8f4614259d5127bd9ba5774996b75219cced78e8' into eclair-plus-aosp
* 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:13:31 +0000 (10:13 -0800)]
am
33c8bdb1: am
b446443e: Only show manually entered URLs in suggestions.
Merge commit '
33c8bdb17d9ef65d5cc790a1059712d8b65dc60b'
* commit '
33c8bdb17d9ef65d5cc790a1059712d8b65dc60b':
Only show manually entered URLs in suggestions.
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:52:17 +0000 (02:52 -0800)]
am
3e1773fe: (-s ours) am
3f355eae: am
c44c7a6b: (-s ours) Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes. Do not merge.
Merge commit '
3e1773fee11c9e4db9b1a08b9f777301a3ef9197'
* commit '
3e1773fee11c9e4db9b1a08b9f777301a3ef9197':
Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes. Do not merge.
Steve Block [Wed, 25 Nov 2009 10:52:13 +0000 (02:52 -0800)]
am
1d4b6cb7: (-s ours) am
743cd9fc: am
164657ef: (-s ours) Adds an explicit type for GeolocationPermissions.getOrigins. Do not merge.
Merge commit '
1d4b6cb7d35c2a05e7123ae99d3c84f119077b2c'
* commit '
1d4b6cb7d35c2a05e7123ae99d3c84f119077b2c':
Adds an explicit type for GeolocationPermissions.getOrigins. Do not merge.
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.
Ben Murdoch [Wed, 25 Nov 2009 10:42:54 +0000 (02:42 -0800)]
am
c44c7a6b: Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes. Do not merge.
Merge commit '
c44c7a6b4e98f9c7674165e547330c17075a3c55' into eclair-plus-aosp
* commit '
c44c7a6b4e98f9c7674165e547330c17075a3c55':
Rename addConsoleMessage to onConsoleMessage to reflect SDK API changes. Do not merge.
Steve Block [Wed, 25 Nov 2009 10:42:51 +0000 (02:42 -0800)]
am
164657ef: Adds an explicit type for GeolocationPermissions.getOrigins. Do not merge.
Merge commit '
164657efe67e7d2ce02ec8804d04dd485f91a098' into eclair-plus-aosp
* commit '
164657efe67e7d2ce02ec8804d04dd485f91a098':
Adds an explicit type for GeolocationPermissions.getOrigins. Do not merge.
Leon Scroggins [Tue, 24 Nov 2009 21:00:20 +0000 (13:00 -0800)]
am
3f199992: am
ea00257e: Pass a message to query the database, rather than doing it in onCreate.
Merge commit '
3f1999925cd1d4fa1afa95a2e1a734b066959801'
* commit '
3f1999925cd1d4fa1afa95a2e1a734b066959801':
Pass a message to query the database, rather than doing it in onCreate.
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:16:33 +0000 (12:16 -0800)]
am
51bc6ae1: am
41d53ed1: Merge change I638d3f45 into eclair-mr2
Merge commit '
51bc6ae18994c9432377b83e3cde933d69a9e1e7'
* commit '
51bc6ae18994c9432377b83e3cde933d69a9e1e7':
Enable some special debug url.
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: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.
OSDN Git Service
