OSDN Git Service
Eric Fischer [Thu, 8 Oct 2009 21:59:51 +0000 (14:59 -0700)]
am
d9f2cf37: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
d9f2cf37c51f1488f1d8914870ecea722215cb3b' into eclair
* commit '
d9f2cf37c51f1488f1d8914870ecea722215cb3b':
Import revised translations. DO NOT MERGE
Grace Kloba [Thu, 8 Oct 2009 02:15:59 +0000 (19:15 -0700)]
We should handle all four cases when strip the "client".
We were incorrect in the third case.
http://www.google.com/m?client=ms-unknown
http://www.google.com/m?hl=en&client=ms-unknown
http://www.google.com/m?client=ms-unknown&q=pizza
http://www.google.com/m?hl=en&client=ms-unknown&q=pizza
Fix http://b/issue?id=
2174396
Eric Fischer [Tue, 6 Oct 2009 23:52:27 +0000 (16:52 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Eric Fischer [Thu, 1 Oct 2009 23:55:49 +0000 (16:55 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Android (Google) Code Review [Thu, 1 Oct 2009 13:26:56 +0000 (09:26 -0400)]
Merge change I5c303ac8 into eclair
* changes:
Adds black and white line above geolocation permissions prompt. Also increases spacing between checkbox and 'remember' text.
Steve Block [Thu, 1 Oct 2009 11:20:11 +0000 (12:20 +0100)]
Adds black and white line above geolocation permissions prompt. Also increases spacing between checkbox and 'remember' text.
This is a fix for bug http://b/issue?id=
2076246.
Change-Id: I5c303ac873b50bf1ca4bc7a6ccd3365bd4dfbb22
Ben Murdoch [Thu, 1 Oct 2009 10:36:19 +0000 (11:36 +0100)]
Update the icon in the Add New Bookmark dialog and add a separator between the title and UI widgets.
Change-Id: I2e6b75a4205a2fdc7a2dbecf276e1ad5cf567d75
Grace Kloba [Thu, 1 Oct 2009 02:20:42 +0000 (19:20 -0700)]
Remove the shadow in the bookmark as it doesn't have title.
Fix http://b/issue?id=
2158516
Leon Scroggins [Wed, 30 Sep 2009 22:14:38 +0000 (18:14 -0400)]
Adjust the spacing between the title and bookmarks/stop button.
Makes the spacing look more like the spacing between the search
bar's go button and microphone button, which are roughly in the
place.
Change-Id: I61d8619c3af8daa3e33ff5b263819f0ffdadb553
Android (Google) Code Review [Wed, 30 Sep 2009 19:38:24 +0000 (15:38 -0400)]
Merge change I3c58dbaa into eclair
* changes:
New assets. This makes the title bar's button match the voice button.
Leon Scroggins [Wed, 30 Sep 2009 19:29:45 +0000 (15:29 -0400)]
New assets. This makes the title bar's button match the voice button.
Change-Id: I3c58dbaa02b5f81c6db5fb96ec1b8021728a5e66
Android (Google) Code Review [Wed, 30 Sep 2009 19:23:57 +0000 (15:23 -0400)]
Merge change Ie3890f91 into eclair
* changes:
Fixes
Nicolas Roard [Wed, 30 Sep 2009 19:00:15 +0000 (20:00 +0100)]
Fixes
Ben Murdoch [Wed, 30 Sep 2009 18:19:39 +0000 (19:19 +0100)]
Update ESPN default bookmark to point to espn.com so we get redirected to the mobile site.
Change-Id: I7793e77b4ae29c60185c6819430a2adbeb5d4a35
Android (Google) Code Review [Wed, 30 Sep 2009 17:07:13 +0000 (13:07 -0400)]
Merge change I9cdaba5e into eclair
* changes:
New assets for settings
Android (Google) Code Review [Wed, 30 Sep 2009 16:57:25 +0000 (12:57 -0400)]
Merge change I0d0fa17a into eclair
* changes:
Sets the intial state of the Geolocation permission prompt 'remember' checkbox to checked every time it is shown.
Steve Block [Wed, 30 Sep 2009 16:46:24 +0000 (17:46 +0100)]
Sets the intial state of the Geolocation permission prompt 'remember' checkbox to checked every time it is shown.
This fixes http://b/issue?id=
2156885.
Change-Id: I0d0fa17ae6065335bbef3e439b44509711ab98dd
Leon Scroggins [Wed, 30 Sep 2009 16:51:27 +0000 (12:51 -0400)]
Remove unused assets.
Change-Id: I591c987be33b032289232cf7ae8aa45ee4e4957c
Android (Google) Code Review [Wed, 30 Sep 2009 16:05:08 +0000 (12:05 -0400)]
Merge change I417aa61d into eclair
* changes:
New asset for the bookmark button in the title bar.
Android (Google) Code Review [Wed, 30 Sep 2009 16:03:40 +0000 (12:03 -0400)]
Merge change Ibf40bd9e into eclair
* changes:
Slide the title bar onto the screen rather than stretching it.
Android (Google) Code Review [Wed, 30 Sep 2009 15:56:58 +0000 (11:56 -0400)]
Merge change I834ba6d2 into eclair
* changes:
Update the CNN bookmark to point to www.cnn.com/index.html. (Bug
2139637)
Leon Scroggins [Wed, 30 Sep 2009 15:55:54 +0000 (11:55 -0400)]
Slide the title bar onto the screen rather than stretching it.
Fix for http://b/issue?id=
2154614
Also update the header for the find dialog animations.
Change-Id: Ibf40bd9ee12c270c2794d4d2316143686a072458
Nicolas Roard [Wed, 30 Sep 2009 15:54:34 +0000 (16:54 +0100)]
New assets for settings
Android (Google) Code Review [Wed, 30 Sep 2009 15:35:28 +0000 (11:35 -0400)]
Merge change I7cb3951e into eclair
* changes:
Removes the list of values previously used when prompting the user to increase the HTML5 database quota.
Leon Scroggins [Wed, 30 Sep 2009 15:23:20 +0000 (11:23 -0400)]
New asset for the bookmark button in the title bar.
Fixes http://b/issue?id=
2145205
Change-Id: I417aa61d7613fea274c22c8c8a8fe8ba38cdf5d2
Ben Murdoch [Wed, 30 Sep 2009 15:12:21 +0000 (16:12 +0100)]
Update the CNN bookmark to point to cnn.com/index.html. (Bug
2139637)
Change-Id: I834ba6d23717de852395a5382f25b2958dcfb6a5
Ben Murdoch [Tue, 29 Sep 2009 17:14:30 +0000 (18:14 +0100)]
Save a new bookmark to the bookmarks DB asynchronously. Fix for bug
2151093.
Change-Id: I860482f0a0610669f87965947b0818508d8988b7
Android (Google) Code Review [Wed, 30 Sep 2009 14:09:38 +0000 (10:09 -0400)]
Merge change Ic78ed87e into eclair
* changes:
Changes "New York Times" to "NY Times" in bookmarks list.
Steve Block [Wed, 30 Sep 2009 13:58:51 +0000 (14:58 +0100)]
Removes the list of values previously used when prompting the user to increase the HTML5 database quota.
These values are superfluous, as the user is no longer prompted in this way.
Change-Id: I7cb3951e26091df24736fe1cf26636fdee3d79dc
Steve Block [Wed, 30 Sep 2009 09:46:44 +0000 (10:46 +0100)]
Changes "New York Times" to "NY Times" in bookmarks list.
This is part of the fix for http://b/issue?id=
2155414.
Also requires changes to vendor-specific strings.
Change-Id: Ic78ed87ebbe33a73fac6635b885b2c9d3113cbce
Leon Clarke [Tue, 29 Sep 2009 17:35:13 +0000 (18:35 +0100)]
Link coloring - do db lookup in new thread
Typo
(cherry picked from commit
ccfb951aa11cfdd7ec8ac97e6003193a1a1d7d5b)
Conflicts:
src/com/android/browser/BrowserActivity.java
Mike Cleron [Wed, 30 Sep 2009 08:10:05 +0000 (01:10 -0700)]
Newer icons
Daniel Sandler [Wed, 30 Sep 2009 04:33:22 +0000 (00:33 -0400)]
New hdpi assets.
Drop dated 29-Sep-2009.
Change-Id: I49bda866e8d96bafa31b601d4842e7f2a4514e9f
Eric Fischer [Tue, 29 Sep 2009 23:40:31 +0000 (16:40 -0700)]
Import revised translations. DO NOT MERGE
Grace Kloba [Tue, 29 Sep 2009 20:13:36 +0000 (13:13 -0700)]
Check null for intent.getData() before using it.
Fix http://b/issue?id=
2151485
Android (Google) Code Review [Tue, 29 Sep 2009 20:52:19 +0000 (16:52 -0400)]
Merge change Id9898b22 into eclair
* changes:
Check to make sure the captured picture is non null before using.
Leon Scroggins [Tue, 29 Sep 2009 20:38:47 +0000 (16:38 -0400)]
Check to make sure the captured picture is non null before using.
Fixes http://b/issue?id=
2154493
Change-Id: Id9898b2251585e8adbae286df6173a2e1989c838
Android (Google) Code Review [Tue, 29 Sep 2009 19:45:29 +0000 (15:45 -0400)]
Merge change I776878e9 into eclair
* changes:
Add '&android-home' to the google homepage string
Android (Google) Code Review [Tue, 29 Sep 2009 19:43:35 +0000 (15:43 -0400)]
Merge change Iffca70f6 into eclair
* changes:
Reduce browser backup agent's amount of logging
Christopher Tate [Tue, 29 Sep 2009 19:40:25 +0000 (12:40 -0700)]
Reduce browser backup agent's amount of logging
DEBUG=false now, and so we emit only one-line activity summaries during backup
and restore.
Change-Id: Iffca70f60581672ce686429db0a4382d934de663
Cary Clark [Tue, 29 Sep 2009 19:12:03 +0000 (15:12 -0400)]
Add '&android-home' to the google homepage string
Also, mark it as non-translatable, and remove the translated
versions.
fixes http://b/issue?id=
2148022
Leon Scroggins [Tue, 29 Sep 2009 17:08:35 +0000 (13:08 -0400)]
Updates for the title bar.
Modify the layout of the title bar to better match that of the
search bar. Also use the newer asset for the bookmarks button.
See http://b/issue?id=
2126429 and http://b/issue?id=
2145205
Change-Id: I14f05ca00a30f67d59d407ac3f6dfb2ac63a8184
Android (Google) Code Review [Tue, 29 Sep 2009 18:31:29 +0000 (14:31 -0400)]
Merge change I237fc084 into eclair
* changes:
Makes Geolocation permissions prompt pretty.
Steve Block [Tue, 29 Sep 2009 12:14:41 +0000 (13:14 +0100)]
Makes Geolocation permissions prompt pretty.
Change-Id: I237fc0845de2297babc7da448a2199c5344e2e83
Android (Google) Code Review [Tue, 29 Sep 2009 18:05:48 +0000 (14:05 -0400)]
Merge change I67f0a56d into eclair
* changes:
Enable fading scrollbar for the Browser
Cary Clark [Tue, 29 Sep 2009 17:00:45 +0000 (13:00 -0400)]
don't create the fake title bar when getGlobalVisible fails
If getGlobalVisibleFails, the visible rectangle top is
assumed to be zero, as if the status bar has no height. The
fake title bar is then drawn underneath the actual status
bar. Bail on the fake title bar creation if the status bar
can't be measured.
Ben Murdoch [Tue, 29 Sep 2009 08:41:11 +0000 (09:41 +0100)]
Fix miniature thumbnail problem and delay saving of a screenshot by 500ms after a page has completed loading to ensure the WebView has completed painting and that we therefore save an accurate thumbnail.
Change-Id: I77f5d12062de0b9703e5d3ec0c53910f4d62743d
Mike Cleron [Tue, 29 Sep 2009 06:50:30 +0000 (23:50 -0700)]
New icons
Grace Kloba [Tue, 29 Sep 2009 04:24:51 +0000 (21:24 -0700)]
Enable fading scrollbar for the Browser
Fix http://b/issue?id=
2151115
Cary Clark [Mon, 28 Sep 2009 21:05:06 +0000 (17:05 -0400)]
check to see if the real title bar has no parent
This works around a monkey-found crash that is unlikely to
be triggerable by a user.
Fixes http://b/issue?id=
2150746
Leon Scroggins [Mon, 28 Sep 2009 19:56:52 +0000 (15:56 -0400)]
More assets refresh.
Change-Id: Ieb591dd057d36919daea4578d0c15bcc896b5672
Leon Scroggins [Mon, 28 Sep 2009 19:30:44 +0000 (15:30 -0400)]
Use new bookmark assets.
Use the latest assets for the bookmark menu option, as well as for
the bookmark tab on the bookmarks page.
Fixes http://b/issue?id=
2145205
Change-Id: Ic36ce791a9352be2a175f5affba32873b4854d8e
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: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
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
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 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
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 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
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:01:45 +0000 (13:01 -0400)]
Use new assets for list view and thumbnail view.
Change-Id: I5a5395c6d64cd71f3af404dc049d89c66dea613b
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, 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 [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 [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 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 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 21:42:41 +0000 (17:42 -0400)]
When hiding the fake title bar, animate or not based on current scroll.
Change-Id: Ib3177e68afa30f3a3c7f42aafe0abbf8b58f0412
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
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
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 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:39:23 +0000 (16:39 +0100)]
Reset title bar after closing tab
Fixes http://b/issue?id=
2139260
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 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
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 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
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 [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
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 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
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.
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
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.