OSDN Git Service

android-x86/packages-apps-Browser.git
14 years agoam 512920d4: am 7d899d6f: 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.

14 years agoam 7d899d6f: 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.

14 years agoFix 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

14 years agoam d2bca5c6: am 9c50b60c: (-s ours) 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

14 years agoam 9c50b60c: (-s ours) 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

14 years agoam 1fc98a32: Remove the fake title bar in onDestroy so that we will not leak the...
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

14 years agoRemove 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

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 17:42:51 +0000 (10:42 -0700)]
Import revised translations.  DO NOT MERGE

Approver: jerryw

14 years agoam aed8c32e: Merge change Ie806375b into eclair-mr2
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.

14 years agoMerge change Ie806375b into eclair-mr2
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.

14 years agoAdds 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

14 years agoam 163ab74e: 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.

14 years agoHide 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

14 years agoam badcfad8: am b3968bbc: 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.

14 years agoam b3968bbc: 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.

14 years agoDisable 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

14 years agoam de353621: Don\'t allow the user to save bookmarks with a scheme that the Browser...
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.

14 years agoDon't allow the user to save bookmarks with a scheme that the Browser cannot directly...
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

14 years agoam 94b10fe2: 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

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 13 Oct 2009 23:04:50 +0000 (16:04 -0700)]
Import revised translations.  DO NOT MERGE

14 years agoam b2b19f50: Hide the fake title bar while showing the context menu.
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.

14 years agoHide 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

14 years agoam 22ac16ea: Move Tab out of TabControl to its own class. So that each tab has its...
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

14 years agoMove 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

14 years agoam 986174aa: Merge change I6d3d5b7e into eclair-mr2
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.

14 years agoMerge change I6d3d5b7e into eclair-mr2
Android (Google) Code Review [Fri, 9 Oct 2009 19:15:46 +0000 (15:15 -0400)]
Merge change I6d3d5b7e into eclair-mr2

* changes:
  File upload.

14 years agoam 73d5e986: Line up the progress bar with the textfield.
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.

14 years agoLine 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

14 years agoFile upload.
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

14 years agoam 4f439baf: am 490be2c2: (-s ours) am 999477f9: (-s ours) Import revised translation...
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':

14 years agoam aa218eeb: am e3a87e1f: (-s ours) am d9f2cf37: (-s ours) Import revised translation...
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':

14 years agoMerge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform...
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

14 years agoam 490be2c2: (-s ours) am 999477f9: (-s ours) Import revised translations. DO NOT...
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

14 years agoam e3a87e1f: (-s ours) am d9f2cf37: (-s ours) Import revised translations. DO NOT...
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

14 years agoam 490be2c2: am 999477f9: (-s ours) 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

14 years agoam e3a87e1f: am d9f2cf37: (-s ours) 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

14 years agoam 999477f9: (-s ours) 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

14 years agoam d9f2cf37: (-s ours) 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

14 years agoImport 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

14 years agoam a9843d95: Merge change Ia16ab67e into eclair-mr2
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.

14 years agoMerge change Ia16ab67e into eclair-mr2
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.

14 years agoam f5169178: am ef292158: We should handle all four cases when strip the "client...
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':

14 years agoMerge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform...
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

14 years agoam ef292158: We should handle all four cases when strip the "client". We were incorre...
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".

14 years agoam ef292158: We should handle all four cases when strip the "client". We were incorre...
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".

14 years agoWe 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

14 years agoam 9a5b829c: Import revised translations. DO NOT MERGE
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

14 years agoam 778773e0: am 9a5b829c: (-s ours) 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

14 years agoam 5d0e02e6: Stop the loading after WAKELOCK_TIMEOUT (5min) when the Browser is in...
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

14 years agoam 9a5b829c: (-s ours) Import revised translations. DO NOT MERGE
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

14 years agoam 07b8eb36: 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

14 years agoChange the bookmark back to cnn.com.
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

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 6 Oct 2009 23:52:27 +0000 (16:52 -0700)]
Import revised translations.   DO NOT MERGE

Approver: jerryw

14 years agoStop the loading after WAKELOCK_TIMEOUT (5min) when
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

14 years agoam fe87bd3a: Update the fake title bar appropriately.
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.

14 years agoUpdate 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.

14 years agoam 4aff3aae: Scale the favicon by the density of the screen.
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.

14 years agoMerge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform...
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

14 years agoScale the favicon by the density of the screen.
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

14 years agoam 07b8eb36: (-s ours) Import revised translations. DO NOT MERGE
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

14 years agoImport 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

14 years agoam 5f3ecb74: Merge change I5c303ac8 into eclair
Steve Block [Thu, 1 Oct 2009 13:32:53 +0000 (06:32 -0700)]
am 5f3ecb74: Merge change I5c303ac8 into eclair

Merge commit '5f3ecb74fe829ba4b4931bef69d6713f9e5819a5' into eclair-plus-aosp

* commit '5f3ecb74fe829ba4b4931bef69d6713f9e5819a5':
  Adds black and white line above geolocation permissions prompt. Also increases spacing between checkbox and 'remember' text.

14 years agoMerge change I5c303ac8 into eclair
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.

14 years agoAdds black and white line above geolocation permissions prompt. Also increases spacin...
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

14 years agoam a753d009: Update the icon in the Add New Bookmark dialog and add a separator betwe...
Ben Murdoch [Thu, 1 Oct 2009 12:20:59 +0000 (05:20 -0700)]
am a753d009: Update the icon in the Add New Bookmark dialog and add a separator between the title and UI widgets.

Merge commit 'a753d009f11cabc73259f0a1c565301550ef1aa2' into eclair-plus-aosp

* commit 'a753d009f11cabc73259f0a1c565301550ef1aa2':
  Update the icon in the Add New Bookmark dialog and add a separator between the title and UI widgets.

14 years agoUpdate the icon in the Add New Bookmark dialog and add a separator between the title...
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

14 years agoam 18edf869: Remove the shadow in the bookmark as it doesn\'t have title.
Grace Kloba [Thu, 1 Oct 2009 04:18:45 +0000 (21:18 -0700)]
am 18edf869: Remove the shadow in the bookmark as it doesn\'t have title.

Merge commit '18edf86985b23b63c65f5729c747e16dc5c915fc' into eclair-plus-aosp

* commit '18edf86985b23b63c65f5729c747e16dc5c915fc':
  Remove the shadow in the bookmark as it doesn't have title.

14 years agoRemove the shadow in the bookmark as it doesn't have title.
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

14 years agoam bd7d5178: Adjust the spacing between the title and bookmarks/stop button.
Leon Scroggins [Wed, 30 Sep 2009 22:22:59 +0000 (15:22 -0700)]
am bd7d5178: Adjust the spacing between the title and bookmarks/stop button.

Merge commit 'bd7d51781ccc0b3a067d17f417c5097cde94f25d' into eclair-plus-aosp

* commit 'bd7d51781ccc0b3a067d17f417c5097cde94f25d':
  Adjust the spacing between the title and bookmarks/stop button.

14 years agoAdjust the spacing between the title and bookmarks/stop button.
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

14 years agoam 84a2df8e: Merge change I3c58dbaa into eclair
Leon Scroggins [Wed, 30 Sep 2009 19:44:39 +0000 (12:44 -0700)]
am 84a2df8e: Merge change I3c58dbaa into eclair

Merge commit '84a2df8efc941db78e78340c9e5a9e808b4eabba' into eclair-plus-aosp

* commit '84a2df8efc941db78e78340c9e5a9e808b4eabba':
  New assets.  This makes the title bar's button match the voice button.

14 years agoMerge change I3c58dbaa into eclair
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.

14 years agoNew 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

14 years agoam 4df3c35c: Merge change Ie3890f91 into eclair
Nicolas Roard [Wed, 30 Sep 2009 19:30:55 +0000 (12:30 -0700)]
am 4df3c35c: Merge change Ie3890f91 into eclair

Merge commit '4df3c35c741cad228730607c3fa3bc4effa26539' into eclair-plus-aosp

* commit '4df3c35c741cad228730607c3fa3bc4effa26539':
  Fixes

14 years agoMerge change Ie3890f91 into eclair
Android (Google) Code Review [Wed, 30 Sep 2009 19:23:57 +0000 (15:23 -0400)]
Merge change Ie3890f91 into eclair

* changes:
  Fixes

14 years agoam e64b3a09: Update ESPN default bookmark to point to espn.com so we get redirected...
Ben Murdoch [Wed, 30 Sep 2009 19:15:54 +0000 (12:15 -0700)]
am e64b3a09: Update ESPN default bookmark to point to espn.com so we get redirected to the mobile site.

Merge commit 'e64b3a094b90ba9a9ec6732fce49700b310bb0a3' into eclair-plus-aosp

* commit 'e64b3a094b90ba9a9ec6732fce49700b310bb0a3':
  Update ESPN default bookmark to point to espn.com so we get redirected to the mobile site.

14 years agoFixes
Nicolas Roard [Wed, 30 Sep 2009 19:00:15 +0000 (20:00 +0100)]
Fixes

14 years agoUpdate ESPN default bookmark to point to espn.com so we get redirected to the mobile...
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

14 years agoam 9725fac3: Merge change I9cdaba5e into eclair
Nicolas Roard [Wed, 30 Sep 2009 17:14:22 +0000 (10:14 -0700)]
am 9725fac3: Merge change I9cdaba5e into eclair

Merge commit '9725fac3df5e4ef3bf7d49d9b0ee0bb4acbc7379' into eclair-plus-aosp

* commit '9725fac3df5e4ef3bf7d49d9b0ee0bb4acbc7379':
  New assets for settings

14 years agoMerge change I9cdaba5e into eclair
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

14 years agoam 322c39b5: Merge change I0d0fa17a into eclair
Steve Block [Wed, 30 Sep 2009 17:02:47 +0000 (10:02 -0700)]
am 322c39b5: Merge change I0d0fa17a into eclair

Merge commit '322c39b55f6418d0173a8925c3cdc38b13d13f14' into eclair-plus-aosp

* commit '322c39b55f6418d0173a8925c3cdc38b13d13f14':
  Sets the intial state of the Geolocation permission prompt 'remember' checkbox to checked every time it is shown.

14 years agoam 1336e6da: Remove unused assets.
Leon Scroggins [Wed, 30 Sep 2009 16:57:53 +0000 (09:57 -0700)]
am 1336e6da: Remove unused assets.

Merge commit '1336e6dacceddbf177e7a40128c5ad965fc9a6af' into eclair-plus-aosp

* commit '1336e6dacceddbf177e7a40128c5ad965fc9a6af':
  Remove unused assets.

14 years agoMerge change I0d0fa17a into eclair
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.

14 years agoSets the intial state of the Geolocation permission prompt 'remember' checkbox to...
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

14 years agoRemove unused assets.
Leon Scroggins [Wed, 30 Sep 2009 16:51:27 +0000 (12:51 -0400)]
Remove unused assets.

Change-Id: I591c987be33b032289232cf7ae8aa45ee4e4957c

14 years agoam f59fb4ef: Merge change I417aa61d into eclair
Leon Scroggins [Wed, 30 Sep 2009 16:07:59 +0000 (09:07 -0700)]
am f59fb4ef: Merge change I417aa61d into eclair

Merge commit 'f59fb4ef72a3ba091aaa6eb0f306680c442c0d5a' into eclair-plus-aosp

* commit 'f59fb4ef72a3ba091aaa6eb0f306680c442c0d5a':
  New asset for the bookmark button in the title bar.

14 years agoam 306feaf5: Merge change Ibf40bd9e into eclair
Leon Scroggins [Wed, 30 Sep 2009 16:07:55 +0000 (09:07 -0700)]
am 306feaf5: Merge change Ibf40bd9e into eclair

Merge commit '306feaf596407d33ab8157d63b1788789a6accd4' into eclair-plus-aosp

* commit '306feaf596407d33ab8157d63b1788789a6accd4':
  Slide the title bar onto the screen rather than stretching it.

14 years agoMerge change I417aa61d into eclair
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.

14 years agoMerge change Ibf40bd9e into eclair
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.

14 years agoam bd955bf1: Merge change I834ba6d2 into eclair
Ben Murdoch [Wed, 30 Sep 2009 16:03:17 +0000 (09:03 -0700)]
am bd955bf1: Merge change I834ba6d2 into eclair

Merge commit 'bd955bf11e88920aa44ae9b043b7bfb8573bbc4a' into eclair-plus-aosp

* commit 'bd955bf11e88920aa44ae9b043b7bfb8573bbc4a':
  Update the CNN bookmark to point to www.cnn.com/index.html. (Bug 2139637)

14 years agoMerge change I834ba6d2 into eclair
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)

14 years agoSlide the title bar onto the screen rather than stretching it.
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

14 years agoNew assets for settings
Nicolas Roard [Wed, 30 Sep 2009 15:54:34 +0000 (16:54 +0100)]
New assets for settings

14 years agoam cbd20bf6: Merge change I7cb3951e into eclair
Steve Block [Wed, 30 Sep 2009 15:43:56 +0000 (08:43 -0700)]
am cbd20bf6: Merge change I7cb3951e into eclair

Merge commit 'cbd20bf6d415881f5f749c4c379fdb1662b079ee' into eclair-plus-aosp

* commit 'cbd20bf6d415881f5f749c4c379fdb1662b079ee':
  Removes the list of values previously used when prompting the user to increase the HTML5 database quota.

14 years agoMerge change I7cb3951e into eclair
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.

14 years agoNew asset for the bookmark button in the title bar.
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

14 years agoUpdate the CNN bookmark to point to www.cnn.com/index.html. (Bug 2139637)
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

14 years agoam 1794fe25: Save a new bookmark to the bookmarks DB asynchronously. Fix for bug...
Ben Murdoch [Wed, 30 Sep 2009 15:06:59 +0000 (08:06 -0700)]
am 1794fe25: Save a new bookmark to the bookmarks DB asynchronously. Fix for bug 2151093.

Merge commit '1794fe252866c311f3b4700a2a1e44e843962243' into eclair-plus-aosp

* commit '1794fe252866c311f3b4700a2a1e44e843962243':
  Save a new bookmark to the bookmarks DB asynchronously. Fix for bug 2151093.

14 years agoSave a new bookmark to the bookmarks DB asynchronously. Fix for bug 2151093.
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

14 years agoam 9957024e: Merge change Ic78ed87e into eclair
Steve Block [Wed, 30 Sep 2009 14:17:51 +0000 (07:17 -0700)]
am 9957024e: Merge change Ic78ed87e into eclair

Merge commit '9957024e9a4c904c83d76df03c4ebf9bdaa5f4c6' into eclair-plus-aosp

* commit '9957024e9a4c904c83d76df03c4ebf9bdaa5f4c6':
  Changes "New York Times" to "NY Times" in bookmarks list.