OSDN Git Service
Nicolas Roard [Mon, 28 Sep 2009 17:42:07 +0000 (10:42 -0700)]
am
88fa35e4: Merge change 27451 into eclair
Merge commit '
88fa35e452de655e85ad702b74cc1447d8228711' into eclair-plus-aosp
* commit '
88fa35e452de655e85ad702b74cc1447d8228711':
Fix for the dual notification problem
Leon Scroggins [Mon, 28 Sep 2009 17:42:04 +0000 (10:42 -0700)]
am
29a6b734: Merge change 27460 into eclair
Merge commit '
29a6b73472c2876a958b2d171b3cdb5e912254df' into eclair-plus-aosp
* commit '
29a6b73472c2876a958b2d171b3cdb5e912254df':
Update menu items.
Android (Google) Code Review [Mon, 28 Sep 2009 17:37:06 +0000 (13:37 -0400)]
Merge change 27451 into eclair
* changes:
Fix for the dual notification problem
Android (Google) Code Review [Mon, 28 Sep 2009 17:36:37 +0000 (13:36 -0400)]
Merge change 27460 into eclair
* changes:
Update menu items.
Nicolas Roard [Mon, 28 Sep 2009 16:03:36 +0000 (17:03 +0100)]
Fix for the dual notification problem
Leon Scroggins [Mon, 28 Sep 2009 16:54:35 +0000 (09:54 -0700)]
am
bbe6d5b3: Make bookmarks grid view inset by the width of the scrollbar.
Merge commit '
bbe6d5b380d1aba4b0b2eeff1aa514112328968a' into eclair-plus-aosp
* commit '
bbe6d5b380d1aba4b0b2eeff1aa514112328968a':
Make bookmarks grid view inset by the width of the scrollbar.
Leon Scroggins [Mon, 28 Sep 2009 16:01:00 +0000 (12:01 -0400)]
Make bookmarks grid view inset by the width of the scrollbar.
Fix for http://b/issue?id=
2148144
Change-Id: I2291939de843720899dfd8f4281ed9dcb6aa77a4
Leon Scroggins [Mon, 28 Sep 2009 15:21:56 +0000 (11:21 -0400)]
Update menu items.
Fix for http://b/issue?id=
2145205
Change-Id: I9c7de6fc8ff81b7a583c0c9a9724651b3304f93f
Cary Clark [Mon, 28 Sep 2009 14:55:00 +0000 (07:55 -0700)]
am
445aaddf: Merge change 27436 into eclair
Merge commit '
445aaddf7a076fa6e7868437b7034f449a00b0d2' into eclair-plus-aosp
* commit '
445aaddf7a076fa6e7868437b7034f449a00b0d2':
append '&source=android-home' to the homepage_base string
Android (Google) Code Review [Mon, 28 Sep 2009 14:49:47 +0000 (10:49 -0400)]
Merge change 27436 into eclair
* changes:
append '&source=android-home' to the homepage_base string
Cary Clark [Mon, 28 Sep 2009 14:18:29 +0000 (10:18 -0400)]
append '&source=android-home' to the homepage_base string
Additionally, either this string should be marked translatable=false
and all existing translations should be removed or all existing
translations must be updated.
This fixes http://b/issue?id=
2148022
Ben Murdoch [Mon, 28 Sep 2009 10:55:53 +0000 (03:55 -0700)]
am
cbb77455: Merge change 27416 into eclair
Merge commit '
cbb77455ffea06b527e75a8abcea3d590cbe65b8' into eclair-plus-aosp
* commit '
cbb77455ffea06b527e75a8abcea3d590cbe65b8':
Only update the bookmark screenshot if the page completed loading fully (i.e. do not save a screenshot if the user canceled loading.
Android (Google) Code Review [Mon, 28 Sep 2009 10:49:35 +0000 (06:49 -0400)]
Merge change 27416 into eclair
* changes:
Only update the bookmark screenshot if the page completed loading fully (i.e. do not save a screenshot if the user canceled loading.
Ben Murdoch [Mon, 28 Sep 2009 10:32:25 +0000 (03:32 -0700)]
am
fbaf61ea: Fix NPE when adding a new bookmark.
Merge commit '
fbaf61eae57f46580bc48bc76185eef7dd797fa6' into eclair-plus-aosp
* commit '
fbaf61eae57f46580bc48bc76185eef7dd797fa6':
Fix NPE when adding a new bookmark.
Ben Murdoch [Mon, 28 Sep 2009 09:59:09 +0000 (10:59 +0100)]
Only update the bookmark screenshot if the page completed loading fully (i.e. do not save a screenshot if the user canceled loading.
Bug:
2148161
Change-Id: Ia226959cd18848d0eb2e302a9ef894c5c142d37d
Ben Murdoch [Mon, 28 Sep 2009 09:29:35 +0000 (10:29 +0100)]
Fix NPE when adding a new bookmark.
Bug:
2148968
Change-Id: I03025c3845e536d8aba0c1a8f2c6537333422a48
Leon Scroggins [Fri, 25 Sep 2009 20:15:08 +0000 (13:15 -0700)]
am
04b025c3: Merge change 27095 into eclair
Merge commit '
04b025c3d03c5045ea9c4be7c1bb989744491dc0' into eclair-plus-aosp
* commit '
04b025c3d03c5045ea9c4be7c1bb989744491dc0':
Use new, consistent assets for adding a bookmark.
Android (Google) Code Review [Fri, 25 Sep 2009 20:09:51 +0000 (16:09 -0400)]
Merge change 27095 into eclair
* changes:
Use new, consistent assets for adding a bookmark.
Leon Scroggins [Fri, 25 Sep 2009 20:00:29 +0000 (13:00 -0700)]
am
b94bf273: Only draw the fake title bar\'s shadow if the webview is not scrolled.
Merge commit '
b94bf27370329abb27e5e33b493d6edb5662b36e' into eclair-plus-aosp
* commit '
b94bf27370329abb27e5e33b493d6edb5662b36e':
Only draw the fake title bar's shadow if the webview is not scrolled.
Leon Scroggins [Fri, 25 Sep 2009 19:47:05 +0000 (15:47 -0400)]
Use new, consistent assets for adding a bookmark.
Change-Id: I08b492a792e518acb53a69346d51c8c88c06b75e
Leon Scroggins [Fri, 25 Sep 2009 19:22:08 +0000 (15:22 -0400)]
Only draw the fake title bar's shadow if the webview is not scrolled.
Fixes http://b/issue?id=
2142575
Change-Id: I1b29cf6b7fcf89e6c7ebbb967a46434424d6ba54
Leon Scroggins [Fri, 25 Sep 2009 17:49:04 +0000 (10:49 -0700)]
am
88eddc7b: Merge change 27061 into eclair
Merge commit '
88eddc7b7253328d9eb34c24a3f470c926b5aa15' into eclair-plus-aosp
* commit '
88eddc7b7253328d9eb34c24a3f470c926b5aa15':
Update assets for new tab.
Android (Google) Code Review [Fri, 25 Sep 2009 17:42:19 +0000 (13:42 -0400)]
Merge change 27061 into eclair
* changes:
Update assets for new tab.
Leon Scroggins [Fri, 25 Sep 2009 17:28:15 +0000 (13:28 -0400)]
Update assets for new tab.
Also remove the old one and an obsolete file which references it.
Fixes http://b/issue?id=
2099961
Change-Id: I92e08fcc07826d5bde7ddb87c71932de2e01b778
Leon Scroggins [Fri, 25 Sep 2009 17:09:35 +0000 (10:09 -0700)]
am
fdd10d7a: Use new assets for list view and thumbnail view.
Merge commit '
fdd10d7a80ccd7b90d011fbe40f56f1ac2006594' into eclair-plus-aosp
* commit '
fdd10d7a80ccd7b90d011fbe40f56f1ac2006594':
Use new assets for list view and thumbnail view.
Leon Scroggins [Fri, 25 Sep 2009 17:01:45 +0000 (13:01 -0400)]
Use new assets for list view and thumbnail view.
Change-Id: I5a5395c6d64cd71f3af404dc049d89c66dea613b
Leon Scroggins [Fri, 25 Sep 2009 16:38:59 +0000 (09:38 -0700)]
am
f8551617: Fix layout issues on the bookmarks screen.
Merge commit '
f85516172840450a4d1270b658905dc1649ceaf2' into eclair-plus-aosp
* commit '
f85516172840450a4d1270b658905dc1649ceaf2':
Fix layout issues on the bookmarks screen.
Leon Scroggins [Thu, 24 Sep 2009 20:06:02 +0000 (16:06 -0400)]
Fix layout issues on the bookmarks screen.
Limit the title of a bookmark to stop at the right edge of screenshot.
Use the new default screenshots for bookmarks without screenshots.
Resize the bookmark screenshot to match the size of the default icon.
Fixes http://b/issue?id=
2042025 and http://b/issue?id=
2098770
Change-Id: I66a10671ea98007cfe5bf7502fb1e3619276ca22
Ben Murdoch [Thu, 24 Sep 2009 21:07:12 +0000 (14:07 -0700)]
am
aac7aa6f: In the case of a page load error, save a second screenshot in onProgressChanged(100) to ensure that we save the substituted error page rather than the previous page that loaded. Also save the thumbnail for the page if the user creates the bookmark through
Merge commit '
aac7aa6fcfcb519755987ec126be066323f589c8' into eclair-plus-aosp
* commit '
aac7aa6fcfcb519755987ec126be066323f589c8':
In the case of a page load error, save a second screenshot in onProgressChanged(100) to ensure that we save the substituted error page rather than the previous page that loaded. Also save the thumbnail for the page if the user creates the bookmark through the add bookmark menu or clicking the add bookmark icon on the bookmarks page.
Ben Murdoch [Thu, 17 Sep 2009 15:57:40 +0000 (16:57 +0100)]
In the case of a page load error, save a second screenshot in onProgressChanged(100) to ensure that we save the substituted error page rather than the previous page that loaded. Also save the thumbnail for the page if the user creates the bookmark through the add bookmark menu or clicking the add bookmark icon on the bookmarks page.
Change-Id: Ib2b7692a45290f9ce372968e05cde8f6903e4572
Leon Scroggins [Thu, 24 Sep 2009 17:58:13 +0000 (10:58 -0700)]
am
c6fa1104: Add a context menu for the title bar.
Merge commit '
c6fa1104e549b8f5b89195d22c41059e77672dfa' into eclair-plus-aosp
* commit '
c6fa1104e549b8f5b89195d22c41059e77672dfa':
Add a context menu for the title bar.
Leon Scroggins [Mon, 21 Sep 2009 14:40:01 +0000 (10:40 -0400)]
Add a context menu for the title bar.
Fix for http://b/issue?id=
2131232
Change-Id: I28f23d4dc1060208c3d12cf8e2bcbd0be24a9c6c
Grace Kloba [Thu, 24 Sep 2009 16:55:47 +0000 (09:55 -0700)]
am
674f39ae: Add enable plug-ins to UI. Remove pluginsPath from BrowserSettings as it is unused now.
Merge commit '
674f39ae50fb78dbc50c9249a8681cfcab04e6a0' into eclair-plus-aosp
* commit '
674f39ae50fb78dbc50c9249a8681cfcab04e6a0':
Add enable plug-ins to UI. Remove pluginsPath from BrowserSettings as it is unused now.
Grace Kloba [Thu, 24 Sep 2009 16:55:44 +0000 (09:55 -0700)]
am
00d85e74: We should return after calling moveTaskToBack when there is no current tab.
Merge commit '
00d85e74921459b34e70eb93368245b4c0a9bf5f' into eclair-plus-aosp
* commit '
00d85e74921459b34e70eb93368245b4c0a9bf5f':
We should return after calling moveTaskToBack when there is no current tab.
Grace Kloba [Wed, 23 Sep 2009 20:33:10 +0000 (13:33 -0700)]
Add enable plug-ins to UI. Remove pluginsPath from BrowserSettings as it is unused now.
Grace Kloba [Thu, 24 Sep 2009 01:50:05 +0000 (18:50 -0700)]
We should return after calling moveTaskToBack when there is no current tab.
Fix http://b/issue?id=
2142160
Grace Kloba [Thu, 24 Sep 2009 16:45:39 +0000 (09:45 -0700)]
am
0923d69a: If we get web search request in onCreate, just finish the current activity. Otherwise it puts the BrowserActivity in a bad state where there is no current tab.
Merge commit '
0923d69a8ca45222cabd82a80eaa88da9f132e9a' into eclair-plus-aosp
* commit '
0923d69a8ca45222cabd82a80eaa88da9f132e9a':
If we get web search request in onCreate, just finish the
Grace Kloba [Thu, 24 Sep 2009 04:37:25 +0000 (21:37 -0700)]
If we get web search request in onCreate, just finish the
current activity. Otherwise it puts the BrowserActivity in
a bad state where there is no current tab.
Fix http://b/issue?id=
2142368
Andrei Popescu [Thu, 24 Sep 2009 14:01:24 +0000 (07:01 -0700)]
am
10fdba8a: Add possibility to customize the chooser dialog used to allow the user to choose the application for sharing a link.
Merge commit '
10fdba8a1a4598e7081c150f551c15dbe4a55634' into eclair-plus-aosp
* commit '
10fdba8a1a4598e7081c150f551c15dbe4a55634':
Add possibility to customize the chooser dialog used to allow the user
Andrei Popescu [Thu, 24 Sep 2009 12:25:47 +0000 (13:25 +0100)]
Add possibility to customize the chooser dialog used to allow the user
to choose the application for sharing a link.
Fixes http://b/issue?id=
2099733
Leon Scroggins [Wed, 23 Sep 2009 22:03:33 +0000 (15:03 -0700)]
am
20329570: When hiding the fake title bar, animate or not based on current scroll.
Merge commit '
20329570ba9409637298da90b83f25801d7a3d55' into eclair-plus-aosp
* commit '
20329570ba9409637298da90b83f25801d7a3d55':
When hiding the fake title bar, animate or not based on current scroll.
Leon Scroggins [Wed, 23 Sep 2009 21:42:41 +0000 (17:42 -0400)]
When hiding the fake title bar, animate or not based on current scroll.
Change-Id: Ib3177e68afa30f3a3c7f42aafe0abbf8b58f0412
Leon Scroggins [Wed, 23 Sep 2009 20:56:06 +0000 (13:56 -0700)]
am
2dc5d157: Merge change 26660 into eclair
Merge commit '
2dc5d157d314627022d112b13b75ff48b2786751' into eclair-plus-aosp
* commit '
2dc5d157d314627022d112b13b75ff48b2786751':
Draw pressed states on the fake title bar.
Android (Google) Code Review [Wed, 23 Sep 2009 20:50:25 +0000 (16:50 -0400)]
Merge change 26660 into eclair
* changes:
Draw pressed states on the fake title bar.
Leon Scroggins [Wed, 23 Sep 2009 20:19:22 +0000 (16:19 -0400)]
Draw pressed states on the fake title bar.
Use custom selectors for the title bar and its button.
Fixes http://b/issue?id=
2127259
Change-Id: I19a7912f6edc0b7ef46907d25907dc3f5a65efd7
Leon Scroggins [Wed, 23 Sep 2009 19:30:31 +0000 (12:30 -0700)]
am
7c9a7ea3: Merge change 26630 into eclair
Merge commit '
7c9a7ea3ed7384da7082351f727053ad6327614c' into eclair-plus-aosp
* commit '
7c9a7ea3ed7384da7082351f727053ad6327614c':
Tweaks to improve the look of the bookmarks page.
Android (Google) Code Review [Wed, 23 Sep 2009 19:25:34 +0000 (15:25 -0400)]
Merge change 26630 into eclair
* changes:
Tweaks to improve the look of the bookmarks page.
Leon Scroggins [Thu, 17 Sep 2009 16:46:04 +0000 (12:46 -0400)]
Tweaks to improve the look of the bookmarks page.
Change the size of the thumbnails for hi dpi. Scale the
thumbnails according to the content width. Make the overlay
on the first item slightly lighter.
See http://b/issue?id=
2137041
Change-Id: Ib461459c37ee03d1a6013a404a35c3869a8bb284
Patrick Scott [Wed, 23 Sep 2009 18:59:44 +0000 (11:59 -0700)]
am
2a7703ba: Merge change 26588 into eclair
Merge commit '
2a7703ba91cf5f78cac6d07f6c6723d8136cc6c9' into eclair-plus-aosp
* commit '
2a7703ba91cf5f78cac6d07f6c6723d8136cc6c9':
Use favicons in the tab page instead of a snapshot.
Android (Google) Code Review [Wed, 23 Sep 2009 18:54:57 +0000 (14:54 -0400)]
Merge change 26588 into eclair
* changes:
Use favicons in the tab page instead of a snapshot.
Patrick Scott [Wed, 23 Sep 2009 12:08:17 +0000 (08:08 -0400)]
Use favicons in the tab page instead of a snapshot.
Remove the FakeWebView and all the picture stuff from the picker data. Use the
favicon in a layout similar to history and bookmarks. Add tab_view_add_tab.xml
to have a simpler layout for the "new tab" item in the list.
Grace Kloba [Wed, 23 Sep 2009 16:54:33 +0000 (09:54 -0700)]
am
da0fe556: Move the page up/down shortcut key from onKeyUp to onKeyDown as WebView handles the keys in down, not up.
Merge commit '
da0fe556a00773ce2af25eb6dcc5442bd08c7add' into eclair-plus-aosp
* commit '
da0fe556a00773ce2af25eb6dcc5442bd08c7add':
Move the page up/down shortcut key from onKeyUp to onKeyDown as
Grace Kloba [Wed, 23 Sep 2009 01:17:24 +0000 (18:17 -0700)]
Move the page up/down shortcut key from onKeyUp to onKeyDown as
WebView handles the keys in down, not up.
Andrei Popescu [Wed, 23 Sep 2009 15:49:11 +0000 (08:49 -0700)]
am
a5bf1dec: Reset title bar after closing tab
Merge commit '
a5bf1deca120315a2643ea5b010f94d853461b15' into eclair-plus-aosp
* commit '
a5bf1deca120315a2643ea5b010f94d853461b15':
Reset title bar after closing tab
Andrei Popescu [Wed, 23 Sep 2009 15:39:23 +0000 (16:39 +0100)]
Reset title bar after closing tab
Fixes http://b/issue?id=
2139260
Andrei Popescu [Wed, 23 Sep 2009 15:09:40 +0000 (08:09 -0700)]
am
c9526195: Make the deletion of bookmarks depend on both title and URL
Merge commit '
c95261955cf08f30b484b6a229c4bcff42c645ce' into eclair-plus-aosp
* commit '
c95261955cf08f30b484b6a229c4bcff42c645ce':
Make the deletion of bookmarks depend on both title and URL
Andrei Popescu [Wed, 23 Sep 2009 14:52:16 +0000 (15:52 +0100)]
Make the deletion of bookmarks depend on both title and URL
Fixes http://b/issue?id=
2134421
Cary Clark [Tue, 22 Sep 2009 21:28:55 +0000 (14:28 -0700)]
am
5e335a38: switch to modern contact interface
Merge commit '
5e335a381a0cd66e94117b202c1f34f5cb29c9b8' into eclair-plus-aosp
* commit '
5e335a381a0cd66e94117b202c1f34f5cb29c9b8':
switch to modern contact interface
Cary Clark [Tue, 22 Sep 2009 18:53:11 +0000 (14:53 -0400)]
switch to modern contact interface
The browser can launch an intent to add a phone number
on a web page to a contact. Use the current interface
to do so instead of the deprecated interface.
Fixes http://b/issue?id=
2126565
Bjorn Bringert [Tue, 22 Sep 2009 21:08:09 +0000 (14:08 -0700)]
am
3ef0c156: Merge change 26353 into eclair
Merge commit '
3ef0c156b919b622a15058bba780ec457d2470ce' into eclair-plus-aosp
* commit '
3ef0c156b919b622a15058bba780ec457d2470ce':
Pass search intent extra data through the browser
Android (Google) Code Review [Tue, 22 Sep 2009 20:58:59 +0000 (16:58 -0400)]
Merge change 26353 into eclair
* changes:
Pass search intent extra data through the browser
Leon Scroggins [Tue, 22 Sep 2009 20:27:30 +0000 (13:27 -0700)]
am
5bd55d1f: Use a modified version of the search plate for the browser bar.
Merge commit '
5bd55d1f2f466052f63c685b316d96ac9b636435' into eclair-plus-aosp
* commit '
5bd55d1f2f466052f63c685b316d96ac9b636435':
Use a modified version of the search plate for the browser bar.
Leon Scroggins [Tue, 22 Sep 2009 15:23:52 +0000 (11:23 -0400)]
Use a modified version of the search plate for the browser bar.
Change-Id: I92b472de69756c68e8a0f8dcacf8bd4787597dd5
Bjorn Bringert [Tue, 22 Sep 2009 09:36:01 +0000 (10:36 +0100)]
Pass search intent extra data through the browser
This is needed by some web search providers for logging.
Change-Id: I7a6dba26d79ee97e4a4628269b212e80151ad9ee
Nicolas Roard [Tue, 22 Sep 2009 18:10:30 +0000 (11:10 -0700)]
am
e08dbd1e: Merge change 26219 into eclair
Merge commit '
e08dbd1e3f486153b9765dc51bb13a8231bec57b' into eclair-plus-aosp
* commit '
e08dbd1e3f486153b9765dc51bb13a8231bec57b':
Reimplement the settings to use async callbacks
Android (Google) Code Review [Tue, 22 Sep 2009 18:02:54 +0000 (14:02 -0400)]
Merge change 26219 into eclair
* changes:
Reimplement the settings to use async callbacks
Patrick Scott [Tue, 22 Sep 2009 17:34:59 +0000 (10:34 -0700)]
am
59ce830c: Support precomposed app icons.
Merge commit '
59ce830c6eab58171b727abe5282c4abadb1a040' into eclair-plus-aosp
* commit '
59ce830c6eab58171b727abe5282c4abadb1a040':
Support precomposed app icons.
Patrick Scott [Fri, 18 Sep 2009 20:29:38 +0000 (16:29 -0400)]
Support precomposed app icons.
The precomposed icon overrides any other touch icon. We still need to do the
round rect clip because apparently apple still applies the rounded corners, just
not the glass effect. Inset the rectangle by 1 to fit the icons better.
Nicolas Roard [Tue, 22 Sep 2009 14:17:52 +0000 (15:17 +0100)]
Reimplement the settings to use async callbacks
Leon Scroggins [Tue, 22 Sep 2009 13:46:25 +0000 (06:46 -0700)]
am
f4672127: Merge change 26273 into eclair
Merge commit '
f4672127dba061c9d4d69a1139e9c8e43d740a49' into eclair-plus-aosp
* commit '
f4672127dba061c9d4d69a1139e9c8e43d740a49':
Updates for bookmarks page.
Android (Google) Code Review [Tue, 22 Sep 2009 13:38:29 +0000 (09:38 -0400)]
Merge change 26273 into eclair
* changes:
Updates for bookmarks page.
Leon Scroggins [Mon, 21 Sep 2009 23:05:49 +0000 (19:05 -0400)]
Updates for bookmarks page.
Move the title below the snapshot, and for the current page, dim
the whole snapshot.
Change-Id: Ia6aaa68c45c47a0dad6090b190cec2d6dee65f28
Leon Scroggins [Mon, 21 Sep 2009 21:25:34 +0000 (14:25 -0700)]
am
68549868: Add a shadow to the fake title bar.
Merge commit '
685498685d8424f48d77d26d8d5790da34645f44' into eclair-plus-aosp
* commit '
685498685d8424f48d77d26d8d5790da34645f44':
Add a shadow to the fake title bar.
Leon Scroggins [Mon, 21 Sep 2009 20:02:01 +0000 (16:02 -0400)]
Add a shadow to the fake title bar.
Remove old code which requests windowOverlays. When inserting the
fake title bar, put a shadow underneath it. Do not show it if the
scroll is at the top, since it is transparent, and showing it along
with the shadow below the real title bar would show a darker shadow.
Fixes http://b/issue?id=
2118813
Change-Id: I84b8975ea82cc8659b702112c7e67498f863916c
Patrick Scott [Mon, 21 Sep 2009 20:53:27 +0000 (13:53 -0700)]
am
e6843ded: Merge change 26235 into eclair
Merge commit '
e6843ded7f8db1d99d42e8ccde706a35dda39755' into eclair-plus-aosp
* commit '
e6843ded7f8db1d99d42e8ccde706a35dda39755':
Check for a valid token before adding the fake title bar.
Android (Google) Code Review [Mon, 21 Sep 2009 20:45:11 +0000 (16:45 -0400)]
Merge change 26235 into eclair
* changes:
Check for a valid token before adding the fake title bar.
Patrick Scott [Mon, 21 Sep 2009 20:37:29 +0000 (16:37 -0400)]
Check for a valid token before adding the fake title bar.
This is basically what happens when adding the view to the window. In some
cases, the decor view may be null or the window token may be null which throws
an exception.
Andrei Popescu [Mon, 21 Sep 2009 19:10:49 +0000 (12:10 -0700)]
am
cd921352: Merge change 26174 into eclair
Merge commit '
cd921352dd09c208258e85fa5926b4e3a1b34f4d' into eclair-plus-aosp
* commit '
cd921352dd09c208258e85fa5926b4e3a1b34f4d':
Remove Gears files
Android (Google) Code Review [Mon, 21 Sep 2009 19:02:56 +0000 (15:02 -0400)]
Merge change 26174 into eclair
* changes:
Remove Gears files
Andrei Popescu [Mon, 21 Sep 2009 17:49:42 +0000 (18:49 +0100)]
Remove Gears files
Patrick Scott [Mon, 21 Sep 2009 17:52:30 +0000 (10:52 -0700)]
am
79c08f57: Merge change 26168 into eclair
Merge commit '
79c08f57c8220b717f994b905b2430a940f85bce' into eclair-plus-aosp
* commit '
79c08f57c8220b717f994b905b2430a940f85bce':
Update the correct favicon when starting the load.
Android (Google) Code Review [Mon, 21 Sep 2009 17:47:07 +0000 (13:47 -0400)]
Merge change 26168 into eclair
* changes:
Update the correct favicon when starting the load.
Patrick Scott [Mon, 21 Sep 2009 17:39:37 +0000 (13:39 -0400)]
Update the correct favicon when starting the load.
The WebView's original url and current url are incorrect during the provisional
load. Use the given url instead when updating the favicon.
Cary Clark [Mon, 21 Sep 2009 17:00:50 +0000 (10:00 -0700)]
am
41a70db6: Merge change 26151 into eclair
Merge commit '
41a70db682e87c73d0758f2239ec19fd429a72c7' into eclair-plus-aosp
* commit '
41a70db682e87c73d0758f2239ec19fd429a72c7':
Account for find dialog height in content height
Android (Google) Code Review [Mon, 21 Sep 2009 16:53:26 +0000 (12:53 -0400)]
Merge change 26151 into eclair
* changes:
Account for find dialog height in content height
Cary Clark [Mon, 21 Sep 2009 16:01:52 +0000 (12:01 -0400)]
Account for find dialog height in content height
Use the set dialog height when the find dialog is up so that
found items at the bottom of the screen are scrolled into view.
This uses a companion change in webview that takes the find
dialog height into account when computing the content height.
Fixes http://b/issue?id=
2122916
Leon Scroggins [Mon, 21 Sep 2009 15:39:50 +0000 (08:39 -0700)]
am
3cfdf77d: Merge change 26149 into eclair
Merge commit '
3cfdf77d8dac3b5a4a2e1a72f27a1650c09f72e9' into eclair-plus-aosp
* commit '
3cfdf77d8dac3b5a4a2e1a72f27a1650c09f72e9':
Show the fake title bar when loading regardless of scroll position.
Android (Google) Code Review [Mon, 21 Sep 2009 15:33:22 +0000 (11:33 -0400)]
Merge change 26149 into eclair
* changes:
Show the fake title bar when loading regardless of scroll position.
Ben Murdoch [Mon, 21 Sep 2009 15:10:14 +0000 (08:10 -0700)]
am
9f009767: Merge change 26147 into eclair
Merge commit '
9f009767d91d8fd43607d90b832c7cbe56847a08' into eclair-plus-aosp
* commit '
9f009767d91d8fd43607d90b832c7cbe56847a08':
Make the Combined Bookmark and History Activity use the BrowserActivity as it's search provider so that we can start typing on the bookmarks page and perform a search/URL load.
Android (Google) Code Review [Mon, 21 Sep 2009 15:02:26 +0000 (11:02 -0400)]
Merge change 26147 into eclair
* changes:
Make the Combined Bookmark and History Activity use the BrowserActivity as it's search provider so that we can start typing on the bookmarks page and perform a search/URL load.
Leon Scroggins [Mon, 21 Sep 2009 14:38:24 +0000 (10:38 -0400)]
Show the fake title bar when loading regardless of scroll position.
Fix for http://b/issue?id=
2131516
Change-Id: I7d5e02928a36d732b4fc4a2a6b47d7f59e473de1
Ben Murdoch [Mon, 21 Sep 2009 14:34:14 +0000 (07:34 -0700)]
am
dcc2b6f0: Put current screenshot under "Add" on bookmark thumbnail page.
Merge commit '
dcc2b6f08dd5677bc6ba761a9ba6f1c655113051' into eclair-plus-aosp
* commit '
dcc2b6f08dd5677bc6ba761a9ba6f1c655113051':
Put current screenshot under "Add" on bookmark thumbnail page.
Ben Murdoch [Mon, 21 Sep 2009 14:34:07 +0000 (15:34 +0100)]
Make the Combined Bookmark and History Activity use the BrowserActivity as it's search provider so that we can start typing on the bookmarks page and perform a search/URL load.
Change-Id: Ic05a19fab3ddccd99c5a07c6c9c10b85c791717a
Ben Murdoch [Mon, 21 Sep 2009 13:29:20 +0000 (14:29 +0100)]
Put current screenshot under "Add" on bookmark thumbnail page.
Change-Id: Iaf52037f755fea343ef68a23d3740f0f5cdcecb7
Grace Kloba [Sun, 20 Sep 2009 17:29:17 +0000 (10:29 -0700)]
am
5942df0c: Handle BACK key at UP in the Browser.
Merge commit '
5942df0c38dff7e4335e352e2d03f100b07b8907' into eclair-plus-aosp
* commit '
5942df0c38dff7e4335e352e2d03f100b07b8907':
Handle BACK key at UP in the Browser.
Grace Kloba [Fri, 18 Sep 2009 18:48:29 +0000 (11:48 -0700)]
Handle BACK key at UP in the Browser.
Remove KeyTracker, use KeyEvent instead.
Remove ImageGrid and ImageAdapter.
Roy West [Sat, 19 Sep 2009 00:08:58 +0000 (17:08 -0700)]
am
7d9e4240: Fix bug
2121080: edits to Browser strings.
Merge commit '
7d9e4240fd61ccc17797e520b834b3a27c8bf6ad' into eclair-plus-aosp
* commit '
7d9e4240fd61ccc17797e520b834b3a27c8bf6ad':
Fix bug
2121080: edits to Browser strings.
Roy West [Fri, 18 Sep 2009 23:29:38 +0000 (16:29 -0700)]
Fix bug
2121080: edits to Browser strings.
Note that we are staying with "window" not "tab" for Eclair.
Leon Scroggins [Fri, 18 Sep 2009 20:07:44 +0000 (13:07 -0700)]
am
b097c214: Merge change 25131 into eclair
Merge commit '
b097c214161b596c661f28bfcbf421fa73103e12' into eclair-plus-aosp
* commit '
b097c214161b596c661f28bfcbf421fa73103e12':
Add javacript to intent filters for the Browser.
Android (Google) Code Review [Fri, 18 Sep 2009 20:02:49 +0000 (16:02 -0400)]
Merge change 25131 into eclair
* changes:
Add javacript to intent filters for the Browser.