OSDN Git Service
Ben Murdoch [Tue, 27 Oct 2009 12:40:33 +0000 (05:40 -0700)]
am
dedb65f6: am
ae59c3f5: Stretch short landscape bookmark screenshots to fill the correct amount of space.
Merge commit '
dedb65f6a0ed8141d1114a213556fd01529e0b72'
* commit '
dedb65f6a0ed8141d1114a213556fd01529e0b72':
Stretch short landscape bookmark screenshots to fill the correct amount of space.
Ben Murdoch [Tue, 27 Oct 2009 12:35:32 +0000 (05:35 -0700)]
am
ae59c3f5: Stretch short landscape bookmark screenshots to fill the correct amount of space.
Merge commit '
ae59c3f5a5b492f91d72e1d26702a13b91a43fa4' into eclair-mr2-plus-aosp
* commit '
ae59c3f5a5b492f91d72e1d26702a13b91a43fa4':
Stretch short landscape bookmark screenshots to fill the correct amount of space.
Ben Murdoch [Tue, 27 Oct 2009 12:30:36 +0000 (05:30 -0700)]
am
4abbaab3: am
9e19e44f: Remove the "clear all" menu option when you are in the website settings activity and are looking at the settings for a specific site rather than the overview of all sites.
Merge commit '
4abbaab374eba11c08512d3d91ab02fd28d46ea8'
* commit '
4abbaab374eba11c08512d3d91ab02fd28d46ea8':
Remove the "clear all" menu option when you are in the website settings activity and are looking at the settings for a specific site rather than the overview of all sites.
Ben Murdoch [Tue, 20 Oct 2009 17:30:28 +0000 (18:30 +0100)]
Stretch short landscape bookmark screenshots to fill the correct amount of space.
Change-Id: Iea18faab7ef08ace675e19c1047d15a39f12ec97
(cherry picked from commit
85b59baf17a443e6d89aed50d77149513ceb526c)
Ben Murdoch [Tue, 27 Oct 2009 12:25:32 +0000 (05:25 -0700)]
am
9e19e44f: Remove the "clear all" menu option when you are in the website settings activity and are looking at the settings for a specific site rather than the overview of all sites.
Merge commit '
9e19e44f0b27f12cd07913548c23a885d822e716' into eclair-mr2-plus-aosp
* commit '
9e19e44f0b27f12cd07913548c23a885d822e716':
Remove the "clear all" menu option when you are in the website settings activity and are looking at the settings for a specific site rather than the overview of all sites.
Ben Murdoch [Mon, 26 Oct 2009 18:03:44 +0000 (18:03 +0000)]
Remove the "clear all" menu option when you are in the website settings activity and are looking at the settings for a specific site rather than the overview of all sites.
Change-Id: Ic31677187ef0befe144168400732c760ebe73f8b
Robert Greenwalt [Fri, 23 Oct 2009 18:39:00 +0000 (11:39 -0700)]
am
a6162521: am
512920d4: am
7d899d6f: Fix how browser determines if it has connectivity.
Merge commit '
a6162521ab35ce640d04d6b34f082edf9644951c'
* commit '
a6162521ab35ce640d04d6b34f082edf9644951c':
Fix how browser determines if it has connectivity.
Robert Greenwalt [Fri, 23 Oct 2009 18:33:20 +0000 (11:33 -0700)]
am
512920d4: am
7d899d6f: Fix how browser determines if it has connectivity.
Merge commit '
512920d4c7c02c90dcbc27c0f7f33d53fb636dcf' into eclair-mr2-plus-aosp
* commit '
512920d4c7c02c90dcbc27c0f7f33d53fb636dcf':
Fix how browser determines if it has connectivity.
Robert Greenwalt [Fri, 23 Oct 2009 18:27:55 +0000 (11:27 -0700)]
am
7d899d6f: Fix how browser determines if it has connectivity.
Merge commit '
7d899d6f5364a5b20716497a3be5e2f778a2bc0e' into eclair-mr2
* commit '
7d899d6f5364a5b20716497a3be5e2f778a2bc0e':
Fix how browser determines if it has connectivity.
Robert Greenwalt [Fri, 23 Oct 2009 17:33:48 +0000 (10:33 -0700)]
Fix how browser determines if it has connectivity.
Rather than use the connectedness of the last network type to report status
we should use the EXTRA_NO_CONNECTIVITY info included with each status report
to see if there is any network connectivity.
bug:
2203128
Eric Fischer [Thu, 22 Oct 2009 16:46:28 +0000 (09:46 -0700)]
am
b0178921: (-s ours) am
d2bca5c6: am
9c50b60c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
b0178921bd8b95f35ddec754b6022424b356cd7d'
* commit '
b0178921bd8b95f35ddec754b6022424b356cd7d':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 16:34:12 +0000 (09:34 -0700)]
am
d2bca5c6: am
9c50b60c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
d2bca5c6e24bfff6d8fdda45e3265d50f6e28001' into eclair-mr2-plus-aosp
* commit '
d2bca5c6e24bfff6d8fdda45e3265d50f6e28001':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 22 Oct 2009 13:46:22 +0000 (06:46 -0700)]
am
9c50b60c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9c50b60c4b6d6caa164ca198ffb0c2ec3781a661' into eclair-mr2
* commit '
9c50b60c4b6d6caa164ca198ffb0c2ec3781a661':
Import revised translations. DO NOT MERGE
Grace Kloba [Wed, 21 Oct 2009 20:59:36 +0000 (13:59 -0700)]
am
c9ad822e: am
1fc98a32: Remove the fake title bar in onDestroy so that we will not leak the window.
Merge commit '
c9ad822edbb5878d28c36954e021dae9dd4bd5c2'
* commit '
c9ad822edbb5878d28c36954e021dae9dd4bd5c2':
Remove the fake title bar in onDestroy so that we will
Grace Kloba [Wed, 21 Oct 2009 20:43:45 +0000 (13:43 -0700)]
am
1fc98a32: Remove the fake title bar in onDestroy so that we will not leak the window.
Merge commit '
1fc98a322e9df6b0e797c26de6b2cb23d69ad5d3' into eclair-mr2-plus-aosp
* commit '
1fc98a322e9df6b0e797c26de6b2cb23d69ad5d3':
Remove the fake title bar in onDestroy so that we will
Grace Kloba [Wed, 21 Oct 2009 20:23:08 +0000 (13:23 -0700)]
Remove the fake title bar in onDestroy so that we will
not leak the window.
Fix http://b/issue?id=
2198565
Eric Fischer [Wed, 21 Oct 2009 17:42:51 +0000 (10:42 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Steve Block [Wed, 21 Oct 2009 11:52:23 +0000 (04:52 -0700)]
am
16231806: am
aed8c32e: Merge change Ie806375b into eclair-mr2
Merge commit '
162318062c74428efc454078acfb21a37c279c13'
* commit '
162318062c74428efc454078acfb21a37c279c13':
Adds toast for Geolocation permissions prompt.
Steve Block [Wed, 21 Oct 2009 11:41:44 +0000 (04:41 -0700)]
am
aed8c32e: Merge change Ie806375b into eclair-mr2
Merge commit '
aed8c32e130fbd53349b1309734885262e3e552c' into eclair-mr2-plus-aosp
* commit '
aed8c32e130fbd53349b1309734885262e3e552c':
Adds toast for Geolocation permissions prompt.
Android (Google) Code Review [Wed, 21 Oct 2009 11:33:05 +0000 (07:33 -0400)]
Merge change Ie806375b into eclair-mr2
* changes:
Adds toast for Geolocation permissions prompt.
Steve Block [Fri, 16 Oct 2009 17:19:08 +0000 (18:19 +0100)]
Adds toast for Geolocation permissions prompt.
This fixes bug http://b/issue?id=
2076246
Change-Id: Ie806375b22809c47a36ea5cff5699d82e9ee4dfb
Andrei Popescu [Tue, 20 Oct 2009 17:19:09 +0000 (10:19 -0700)]
am
ec04dc74: am
163ab74e: Hide the status bar while a <video> is playing.
Merge commit '
ec04dc74d25b8a47b23cc837c61508f429cbc77b'
* commit '
ec04dc74d25b8a47b23cc837c61508f429cbc77b':
Hide the status bar while a <video> is playing.
Andrei Popescu [Tue, 20 Oct 2009 17:13:49 +0000 (10:13 -0700)]
am
163ab74e: Hide the status bar while a <video> is playing.
Merge commit '
163ab74e2f85b53a1a374c49677073fb64d35f28' into eclair-mr2-plus-aosp
* commit '
163ab74e2f85b53a1a374c49677073fb64d35f28':
Hide the status bar while a <video> is playing.
Andrei Popescu [Tue, 20 Oct 2009 16:58:23 +0000 (17:58 +0100)]
Hide the status bar while a <video> is playing.
Fixes http://b/issue?id=
2200379
Leon Scroggins [Fri, 16 Oct 2009 16:11:35 +0000 (09:11 -0700)]
am
03160558: am
badcfad8: am
b3968bbc: Disable thumbnail view mode for most visited page.
Merge commit '
03160558d2b3d4d5f2248be7f59264f26f790b29'
* commit '
03160558d2b3d4d5f2248be7f59264f26f790b29':
Disable thumbnail view mode for most visited page.
Leon Scroggins [Fri, 16 Oct 2009 16:06:35 +0000 (09:06 -0700)]
am
badcfad8: am
b3968bbc: Disable thumbnail view mode for most visited page.
Merge commit '
badcfad83c548a20fc82a5b5ca195a2baacbd6d5' into eclair-mr2-plus-aosp
* commit '
badcfad83c548a20fc82a5b5ca195a2baacbd6d5':
Disable thumbnail view mode for most visited page.
Leon Scroggins [Fri, 16 Oct 2009 15:59:57 +0000 (08:59 -0700)]
am
b3968bbc: Disable thumbnail view mode for most visited page.
Merge commit '
b3968bbcc96450d45bae2a667cf5ff884070fb10' into eclair-mr2
* commit '
b3968bbcc96450d45bae2a667cf5ff884070fb10':
Disable thumbnail view mode for most visited page.
Leon Scroggins [Fri, 16 Oct 2009 13:04:16 +0000 (09:04 -0400)]
Disable thumbnail view mode for most visited page.
Fix http://b/issue?id=
2191540
Ben Murdoch [Wed, 14 Oct 2009 10:20:21 +0000 (03:20 -0700)]
am
faf8b399: am
de353621: Don\'t allow the user to save bookmarks with a scheme that the Browser cannot directly handle.
Merge commit '
faf8b399f550c05f77de0297f8a6fb55d2fe9b2a'
* commit '
faf8b399f550c05f77de0297f8a6fb55d2fe9b2a':
Don't allow the user to save bookmarks with a scheme that the Browser cannot directly handle.
Ben Murdoch [Wed, 14 Oct 2009 10:12:11 +0000 (03:12 -0700)]
am
de353621: Don\'t allow the user to save bookmarks with a scheme that the Browser cannot directly handle.
Merge commit '
de353621650d17a412b6ffe2cbf0366db5f11c40' into eclair-mr2-plus-aosp
* commit '
de353621650d17a412b6ffe2cbf0366db5f11c40':
Don't allow the user to save bookmarks with a scheme that the Browser cannot directly handle.
Ben Murdoch [Mon, 12 Oct 2009 09:29:00 +0000 (10:29 +0100)]
Don't allow the user to save bookmarks with a scheme that the Browser cannot directly handle.
Change-Id: I9cbdfeaaeef4ded3dac1623854ecb9c5c603eb91
Eric Fischer [Wed, 14 Oct 2009 00:17:44 +0000 (17:17 -0700)]
am
fb523bc8: (-s ours) am
94b10fe2: Import revised translations. DO NOT MERGE
Merge commit '
fb523bc8738143c43f9c2d6d4fac5587a0e6c60d'
* commit '
fb523bc8738143c43f9c2d6d4fac5587a0e6c60d':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 14 Oct 2009 00:08:38 +0000 (17:08 -0700)]
am
94b10fe2: Import revised translations. DO NOT MERGE
Merge commit '
94b10fe271909535c559527a5b5edcdc61b435a0' into eclair-mr2-plus-aosp
* commit '
94b10fe271909535c559527a5b5edcdc61b435a0':
Import revised translations. DO NOT MERGE
Leon Scroggins [Wed, 14 Oct 2009 00:08:23 +0000 (17:08 -0700)]
am
4ae23873: am
b2b19f50: Hide the fake title bar while showing the context menu.
Merge commit '
4ae23873503fc09533753a7ccc5647a65488e200'
* commit '
4ae23873503fc09533753a7ccc5647a65488e200':
Hide the fake title bar while showing the context menu.
Grace Kloba [Tue, 13 Oct 2009 23:54:55 +0000 (16:54 -0700)]
am
4ae93175: am
22ac16ea: Move Tab out of TabControl to its own class. So that each tab has its own WebViewClient, WebChromeClient, ErrorConsoleView, lock icon type and inLoad (matching mPageStarted) state.
Merge commit '
4ae93175fbd9436719b889e1f366f3a9d89c9e9e'
* commit '
4ae93175fbd9436719b889e1f366f3a9d89c9e9e':
Move Tab out of TabControl to its own class. So that
Leon Scroggins [Tue, 13 Oct 2009 23:52:02 +0000 (16:52 -0700)]
Leon Scroggins [Tue, 13 Oct 2009 23:51:51 +0000 (16:51 -0700)]
am
86b06ee0: am
73d5e986: Line up the progress bar with the textfield.
Merge commit '
86b06ee03ffa5cbd9c5f60fa40ae347510feae74'
* commit '
86b06ee03ffa5cbd9c5f60fa40ae347510feae74':
Line up the progress bar with the textfield.
Eric Fischer [Tue, 13 Oct 2009 23:31:09 +0000 (16:31 -0700)]
Reimport translations.
Change-Id: Ida53e568efdbd323294de5609bdecbd39e1e2be6
Eric Fischer [Tue, 13 Oct 2009 23:04:50 +0000 (16:04 -0700)]
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 13 Oct 2009 19:03:46 +0000 (12:03 -0700)]
am
6ece629c: (-s ours) am
4f439baf: am
490be2c2: (-s ours) am
999477f9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
6ece629c8dce3cb772020d07d0f0bb800747da0f'
* commit '
6ece629c8dce3cb772020d07d0f0bb800747da0f':
Eric Fischer [Tue, 13 Oct 2009 19:03:43 +0000 (12:03 -0700)]
am
cc68a36b: (-s ours) am
aa218eeb: am
e3a87e1f: (-s ours) am
d9f2cf37: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
cc68a36bd707e1f0b2d0b70301b50e63025e7bc3'
* commit '
cc68a36bd707e1f0b2d0b70301b50e63025e7bc3':
Mike Lockwood [Tue, 13 Oct 2009 19:03:39 +0000 (12:03 -0700)]
am
2ca50dd7: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Browser into eclair-mr2-plus-aosp
Merge commit '
2ca50dd776c78e122445d5475146c74bd34e2e21'
* commit '
2ca50dd776c78e122445d5475146c74bd34e2e21':
Import revised translations. DO NOT MERGE
Import revised translations. DO NOT MERGE
Patrick Scott [Tue, 13 Oct 2009 18:58:09 +0000 (11:58 -0700)]
am
71bad392: am
a9843d95: Merge change Ia16ab67e into eclair-mr2
Merge commit '
71bad392e36b1037290aeac85dc675abe3fcfdd8'
* commit '
71bad392e36b1037290aeac85dc675abe3fcfdd8':
Change the bookmark back to cnn.com.
Grace Kloba [Tue, 13 Oct 2009 18:50:07 +0000 (11:50 -0700)]
am
9cd75176: am
f5169178: am
ef292158: We should handle all four cases when strip the "client". We were incorrect in the third case.
Merge commit '
9cd75176dd469ffb15b094e496fa53ffd60e8f1c'
* commit '
9cd75176dd469ffb15b094e496fa53ffd60e8f1c':
Iliyan Malchev [Tue, 13 Oct 2009 18:50:02 +0000 (11:50 -0700)]
am
c5b7da7e: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Browser into eclair-mr2-plus-aosp
Merge commit '
c5b7da7ec6588ce057d921abf73915a62ef66cf2'
* commit '
c5b7da7ec6588ce057d921abf73915a62ef66cf2':
We should handle all four cases when strip the "client".
Leon Scroggins [Tue, 13 Oct 2009 18:47:41 +0000 (11:47 -0700)]
am
b2b19f50: Hide the fake title bar while showing the context menu.
Merge commit '
b2b19f501ee05448ca81bddaaca70e9b2f51cb54' into eclair-mr2-plus-aosp
* commit '
b2b19f501ee05448ca81bddaaca70e9b2f51cb54':
Hide the fake title bar while showing the context menu.
Leon Scroggins [Fri, 9 Oct 2009 20:10:00 +0000 (16:10 -0400)]
Hide the fake title bar while showing the context menu.
Fix http://b/issue?id=
2169472
Eric Fischer [Mon, 12 Oct 2009 19:31:29 +0000 (12:31 -0700)]
am
fcdae3b8: (-s ours) am
778773e0: am
9a5b829c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
fcdae3b8a6353182c66600b9cad047762b70cefc'
* commit '
fcdae3b8a6353182c66600b9cad047762b70cefc':
Import revised translations. DO NOT MERGE
Grace Kloba [Mon, 12 Oct 2009 19:31:25 +0000 (12:31 -0700)]
am
4fb2341c: am
5d0e02e6: Stop the loading after WAKELOCK_TIMEOUT (5min) when the Browser is in the background. So we won\'t continue to burn the battery if there is some mis-behaved JavaScript running.
Merge commit '
4fb2341ca6dc479444c3caf48bc88e01c9db588d'
* commit '
4fb2341ca6dc479444c3caf48bc88e01c9db588d':
Stop the loading after WAKELOCK_TIMEOUT (5min) when
Leon Scroggins [Mon, 12 Oct 2009 18:39:30 +0000 (11:39 -0700)]
am
b0b79692: am
fe87bd3a: Update the fake title bar appropriately.
Merge commit '
b0b79692931562a1c9a260855e206bfed4b4243b'
* commit '
b0b79692931562a1c9a260855e206bfed4b4243b':
Update the fake title bar appropriately.
Patrick Scott [Mon, 12 Oct 2009 18:26:40 +0000 (11:26 -0700)]
am
589e40e1: am
4aff3aae: Scale the favicon by the density of the screen.
Merge commit '
589e40e17ee01e9f5e8d2fbd11b23e4e50b02cbe'
* commit '
589e40e17ee01e9f5e8d2fbd11b23e4e50b02cbe':
Scale the favicon by the density of the screen.
Mike Lockwood [Mon, 12 Oct 2009 18:26:36 +0000 (11:26 -0700)]
am
1138a161: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Browser into eclair-mr2-plus-aosp
Merge commit '
1138a16137caed3ee88c5219f42edab30ea3c57e'
* commit '
1138a16137caed3ee88c5219f42edab30ea3c57e':
Eric Fischer [Mon, 12 Oct 2009 18:24:26 +0000 (11:24 -0700)]
am
bdc7f435: (-s ours) am
07b8eb36: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
bdc7f435711950b83274c591eb88143169a9deb9'
* commit '
bdc7f435711950b83274c591eb88143169a9deb9':
Import revised translations. DO NOT MERGE
Grace Kloba [Fri, 9 Oct 2009 21:24:08 +0000 (14:24 -0700)]
am
22ac16ea: Move Tab out of TabControl to its own class. So that each tab has its own WebViewClient, WebChromeClient, ErrorConsoleView, lock icon type and inLoad (matching mPageStarted) state.
Merge commit '
22ac16eab0b62d24a99fc360f2ccea14837f4127' into eclair-mr2-plus-aosp
* commit '
22ac16eab0b62d24a99fc360f2ccea14837f4127':
Move Tab out of TabControl to its own class. So that
Grace Kloba [Thu, 8 Oct 2009 01:00:23 +0000 (18:00 -0700)]
Move Tab out of TabControl to its own class. So that
each tab has its own WebViewClient, WebChromeClient,
ErrorConsoleView, lock icon type and inLoad (matching
mPageStarted) state.
Clean up BrowserActivity, TabControl, create a new Tab class.
Fix stopAllLoading() to stop all main window and sub window loading.
Remove mScale/mScrollX/Y from PickerData as it is not used any more.
Remove doFlick/SensorManager as it is not used any more.
Remove whiteList as it is not used any more.
Remove MASF proxy service as it is not used any more.
With this change,
we will take the snapshot even when it is in the background.
we will update the touchicon url even when it is in the background.
we will update the bookmark/history even when it is in the background.
we will update database quota and max appCache size even when it is in the background.
we will show the error dialog of the background tab when it is brought to the foreground. (New behavior)
we will update the lock icon correctly when switching tabs.
we will proceed the http auth request for the background tab if we already have username and password.
Fix http://b/issue?id=
2158621
Leon Scroggins [Fri, 9 Oct 2009 19:22:34 +0000 (12:22 -0700)]
am
986174aa: Merge change I6d3d5b7e into eclair-mr2
Merge commit '
986174aacfe289956975d731b87a7f99a19ce0b0' into eclair-mr2-plus-aosp
* commit '
986174aacfe289956975d731b87a7f99a19ce0b0':
File upload.
Android (Google) Code Review [Fri, 9 Oct 2009 19:15:46 +0000 (15:15 -0400)]
Merge change I6d3d5b7e into eclair-mr2
* changes:
File upload.
Leon Scroggins [Fri, 9 Oct 2009 19:02:22 +0000 (12:02 -0700)]
am
73d5e986: Line up the progress bar with the textfield.
Merge commit '
73d5e98613b10318e64c3dd7ce3e130dbc7c6576' into eclair-mr2-plus-aosp
* commit '
73d5e98613b10318e64c3dd7ce3e130dbc7c6576':
Line up the progress bar with the textfield.
Leon Scroggins [Fri, 9 Oct 2009 18:54:44 +0000 (14:54 -0400)]
Line up the progress bar with the textfield.
Fixes http://b/issue?id=
2171084
Leon Scroggins [Fri, 2 Oct 2009 19:55:59 +0000 (15:55 -0400)]
File upload.
Requires changes in external/webkit and frameworks/base.
Fix http://b/issue?id=675743
Eric Fischer [Fri, 9 Oct 2009 00:52:01 +0000 (17:52 -0700)]
am
4f439baf: am
490be2c2: (-s ours) am
999477f9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
4f439baf097ac40d2face176e1660d4d1b367ed5' into eclair-mr2-plus-aosp
* commit '
4f439baf097ac40d2face176e1660d4d1b367ed5':
Eric Fischer [Fri, 9 Oct 2009 00:51:58 +0000 (17:51 -0700)]
am
aa218eeb: am
e3a87e1f: (-s ours) am
d9f2cf37: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
aa218eebc64fa3fbe70c01ef70adfead6d7c282c' into eclair-mr2-plus-aosp
* commit '
aa218eebc64fa3fbe70c01ef70adfead6d7c282c':
Mike Lockwood [Fri, 9 Oct 2009 00:51:58 +0000 (17:51 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Browser into eclair-mr2-plus-aosp
Eric Fischer [Fri, 9 Oct 2009 00:33:12 +0000 (17:33 -0700)]
am
490be2c2: (-s ours) am
999477f9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
490be2c2672de706174b2d9cbf867951910427cb' into eclair-mr2
* commit '
490be2c2672de706174b2d9cbf867951910427cb':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 9 Oct 2009 00:33:08 +0000 (17:33 -0700)]
am
e3a87e1f: (-s ours) am
d9f2cf37: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
e3a87e1f6b8ada4be04631c1fb2870957886f0b0' into eclair-mr2
* commit '
e3a87e1f6b8ada4be04631c1fb2870957886f0b0':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22:13:40 +0000 (15:13 -0700)]
am
490be2c2: am
999477f9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
490be2c2672de706174b2d9cbf867951910427cb' into eclair-plus-aosp
* commit '
490be2c2672de706174b2d9cbf867951910427cb':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22:13:36 +0000 (15:13 -0700)]
am
e3a87e1f: am
d9f2cf37: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
e3a87e1f6b8ada4be04631c1fb2870957886f0b0' into eclair-plus-aosp
* commit '
e3a87e1f6b8ada4be04631c1fb2870957886f0b0':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22:02:57 +0000 (15:02 -0700)]
am
999477f9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
999477f9f68152533be14daa933cd7574f4ea6ab' into eclair
* commit '
999477f9f68152533be14daa933cd7574f4ea6ab':
Import revised translations. DO NOT MERGE
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
Eric Fischer [Thu, 8 Oct 2009 19:16:23 +0000 (12:16 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ib97b5af9d196b5b73451e19c0cb11be798995f1d
Patrick Scott [Thu, 8 Oct 2009 19:01:34 +0000 (12:01 -0700)]
am
a9843d95: Merge change Ia16ab67e into eclair-mr2
Merge commit '
a9843d95225c1734175299a7fd0e4237808ba2e8' into eclair-mr2-plus-aosp
* commit '
a9843d95225c1734175299a7fd0e4237808ba2e8':
Change the bookmark back to cnn.com.
Android (Google) Code Review [Thu, 8 Oct 2009 18:52:04 +0000 (14:52 -0400)]
Merge change Ia16ab67e into eclair-mr2
* changes:
Change the bookmark back to cnn.com.
Grace Kloba [Thu, 8 Oct 2009 04:09:41 +0000 (21:09 -0700)]
am
f5169178: am
ef292158: We should handle all four cases when strip the "client". We were incorrect in the third case.
Merge commit '
f5169178b774f1e602394403b1fe1fc45436e216' into eclair-mr2-plus-aosp
* commit '
f5169178b774f1e602394403b1fe1fc45436e216':
Iliyan Malchev [Thu, 8 Oct 2009 04:09:41 +0000 (21:09 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Browser into eclair-mr2-plus-aosp
Grace Kloba [Thu, 8 Oct 2009 04:03:58 +0000 (21:03 -0700)]
am
ef292158: We should handle all four cases when strip the "client". We were incorrect in the third case.
Merge commit '
ef2921584e0c2f425d673dfd2c912b287a6faa5a' into eclair-plus-aosp
* commit '
ef2921584e0c2f425d673dfd2c912b287a6faa5a':
We should handle all four cases when strip the "client".
Grace Kloba [Thu, 8 Oct 2009 04:03:44 +0000 (21:03 -0700)]
am
ef292158: We should handle all four cases when strip the "client". We were incorrect in the third case.
Merge commit '
ef2921584e0c2f425d673dfd2c912b287a6faa5a' into eclair-mr2
* commit '
ef2921584e0c2f425d673dfd2c912b287a6faa5a':
We should handle all four cases when strip the "client".
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 [Wed, 7 Oct 2009 19:08:52 +0000 (12:08 -0700)]
am
9a5b829c: Import revised translations. DO NOT MERGE
Merge commit '
9a5b829ca96b386231ceb927d3dcff40d81ddca3' into eclair-plus-aosp
* commit '
9a5b829ca96b386231ceb927d3dcff40d81ddca3':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 7 Oct 2009 18:52:13 +0000 (11:52 -0700)]
am
778773e0: am
9a5b829c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
778773e07fb881d300645a4ef40a7fa205b6c273' into eclair-mr2-plus-aosp
* commit '
778773e07fb881d300645a4ef40a7fa205b6c273':
Import revised translations. DO NOT MERGE
Grace Kloba [Wed, 7 Oct 2009 18:52:10 +0000 (11:52 -0700)]
am
5d0e02e6: Stop the loading after WAKELOCK_TIMEOUT (5min) when the Browser is in the background. So we won\'t continue to burn the battery if there is some mis-behaved JavaScript running.
Merge commit '
5d0e02e646e46b14289168f75c2a8f6ed43cac54' into eclair-mr2-plus-aosp
* commit '
5d0e02e646e46b14289168f75c2a8f6ed43cac54':
Stop the loading after WAKELOCK_TIMEOUT (5min) when
Eric Fischer [Wed, 7 Oct 2009 18:46:35 +0000 (11:46 -0700)]
am
9a5b829c: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
9a5b829ca96b386231ceb927d3dcff40d81ddca3' into eclair-mr2
* commit '
9a5b829ca96b386231ceb927d3dcff40d81ddca3':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 7 Oct 2009 18:36:03 +0000 (11:36 -0700)]
am
07b8eb36: Import revised translations. DO NOT MERGE
Merge commit '
07b8eb36b7029cc06fc952b496a2e1b5bbcdf84e' into eclair-plus-aosp
* commit '
07b8eb36b7029cc06fc952b496a2e1b5bbcdf84e':
Import revised translations. DO NOT MERGE
Patrick Scott [Wed, 7 Oct 2009 13:47:13 +0000 (09:47 -0400)]
Change the bookmark back to cnn.com.
The snapshot issue has been fixed by adding a redirect map.
Bug:
2132969
Cary Clark [Wed, 7 Oct 2009 13:56:38 +0000 (09:56 -0400)]
do not merge
Change https://android-git.corp.google.com/g/#change,27762
conflicted when the auto-merger ran -- this implements
the change by hand. The original comments:
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
Eric Fischer [Tue, 6 Oct 2009 23:52:27 +0000 (16:52 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Grace Kloba [Mon, 5 Oct 2009 22:15:36 +0000 (15:15 -0700)]
Stop the loading after WAKELOCK_TIMEOUT (5min) when
the Browser is in the background. So we won't continue to
burn the battery if there is some mis-behaved JavaScript
running.
Fix http://b/issue?id=
2147840
Leon Scroggins [Tue, 6 Oct 2009 16:50:48 +0000 (09:50 -0700)]
am
fe87bd3a: Update the fake title bar appropriately.
Merge commit '
fe87bd3a3897e4bad65bb3d284659ae2f4e57570' into eclair-mr2-plus-aosp
* commit '
fe87bd3a3897e4bad65bb3d284659ae2f4e57570':
Update the fake title bar appropriately.
Leon Scroggins [Tue, 6 Oct 2009 14:10:00 +0000 (10:10 -0400)]
Update the fake title bar appropriately.
Fix for http://b/issue?id=
2168682
Rather than updating the fake title bar when it is shown,
always update it with the regular title bar, so it will
have the correct icon etc when it is shown. This also
means that we keep it around, which has the bonus of
eliminating several creations and gcs.
Patrick Scott [Mon, 5 Oct 2009 17:13:09 +0000 (10:13 -0700)]
am
4aff3aae: Scale the favicon by the density of the screen.
Merge commit '
4aff3aae62553f308612d7c6f284ca84aa33e026' into eclair-mr2-plus-aosp
* commit '
4aff3aae62553f308612d7c6f284ca84aa33e026':
Scale the favicon by the density of the screen.
Mike Lockwood [Mon, 5 Oct 2009 17:13:04 +0000 (10:13 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Browser into eclair-mr2-plus-aosp
Patrick Scott [Mon, 5 Oct 2009 13:32:46 +0000 (09:32 -0400)]
Scale the favicon by the density of the screen.
Scale the favicon but keep the padding the same. It looks a little better with
the current bookmark asset.
Bug:
2162987
Eric Fischer [Sun, 4 Oct 2009 22:15:51 +0000 (15:15 -0700)]
am
07b8eb36: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
07b8eb36b7029cc06fc952b496a2e1b5bbcdf84e' into eclair-mr2
* commit '
07b8eb36b7029cc06fc952b496a2e1b5bbcdf84e':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 1 Oct 2009 23:55:49 +0000 (16:55 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Steve Block [Thu, 1 Oct 2009 22:11:38 +0000 (15:11 -0700)]
am
0de55a33: am
5f3ecb74: Merge change I5c303ac8 into eclair
Merge commit '
0de55a338666a847b55d404aa20246f24bef88e5'
* commit '
0de55a338666a847b55d404aa20246f24bef88e5':
Adds black and white line above geolocation permissions prompt. Also increases spacing between checkbox and 'remember' text.
Ben Murdoch [Thu, 1 Oct 2009 22:11:10 +0000 (15:11 -0700)]
am
0bfecb01: am
a753d009: Update the icon in the Add New Bookmark dialog and add a separator between the title and UI widgets.
Merge commit '
0bfecb01cd20f6c1c0515c86e8c274a33db49556'
* commit '
0bfecb01cd20f6c1c0515c86e8c274a33db49556':
Update the icon in the Add New Bookmark dialog and add a separator between the title and UI widgets.
Grace Kloba [Thu, 1 Oct 2009 20:38:55 +0000 (13:38 -0700)]
am
d43041cf: am
18edf869: Remove the shadow in the bookmark as it doesn\'t have title.
Merge commit '
d43041cfd104832753f943b5fbb16693709f87d0'
* commit '
d43041cfd104832753f943b5fbb16693709f87d0':
Remove the shadow in the bookmark as it doesn't have title.
Leon Scroggins [Thu, 1 Oct 2009 19:21:14 +0000 (12:21 -0700)]
am
3e3064dd: am
bd7d5178: Adjust the spacing between the title and bookmarks/stop button.
Merge commit '
3e3064dd83da115144891208ab883d1a41d4180a'
* commit '
3e3064dd83da115144891208ab883d1a41d4180a':
Adjust the spacing between the title and bookmarks/stop button.
Leon Scroggins [Thu, 1 Oct 2009 19:15:42 +0000 (12:15 -0700)]
am
7717ab32: am
84a2df8e: Merge change I3c58dbaa into eclair
Merge commit '
7717ab323d41d55469dc75098a34dca17e142d90'
* commit '
7717ab323d41d55469dc75098a34dca17e142d90':
New assets. This makes the title bar's button match the voice button.
Nicolas Roard [Thu, 1 Oct 2009 19:15:31 +0000 (12:15 -0700)]
Ben Murdoch [Thu, 1 Oct 2009 19:15:05 +0000 (12:15 -0700)]
am
a60c6c72: am
e64b3a09: Update ESPN default bookmark to point to espn.com so we get redirected to the mobile site.
Merge commit '
a60c6c728b1d4ad67cf962be85f0c195f765d654'
* commit '
a60c6c728b1d4ad67cf962be85f0c195f765d654':
Update ESPN default bookmark to point to espn.com so we get redirected to the mobile site.