OSDN Git Service

android-x86/packages-apps-Browser.git
14 years agoam 2ca50dd7: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com...
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

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

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

14 years agoam c5b7da7e: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com...
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".

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

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

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

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

14 years agoam 1138a161: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com...
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':

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

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: 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 agodo not merge
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

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 0de55a33: am 5f3ecb74: Merge change I5c303ac8 into eclair
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.

14 years agoam 0bfecb01: am a753d009: Update the icon in the Add New Bookmark dialog and add...
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.

14 years agoam d43041cf: am 18edf869: Remove the shadow in the bookmark as it doesn\'t have title.
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.

14 years agoam 3e3064dd: am bd7d5178: Adjust the spacing between the title and bookmarks/stop...
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.

14 years agoam 7717ab32: am 84a2df8e: Merge change I3c58dbaa into eclair
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.

14 years agoam 79d3eb5f: am 4df3c35c: Merge change Ie3890f91 into eclair
Nicolas Roard [Thu, 1 Oct 2009 19:15:31 +0000 (12:15 -0700)]
am 79d3eb5f: am 4df3c35c: Merge change Ie3890f91 into eclair

Merge commit '79d3eb5f0bdcbf558c93d09564d2572592fb5536'

* commit '79d3eb5f0bdcbf558c93d09564d2572592fb5536':
  Fixes

14 years agoam a60c6c72: am e64b3a09: Update ESPN default bookmark to point to espn.com so we...
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.

14 years agoam f1e80834: am 9725fac3: Merge change I9cdaba5e into eclair
Nicolas Roard [Thu, 1 Oct 2009 18:59:31 +0000 (11:59 -0700)]
am f1e80834: am 9725fac3: Merge change I9cdaba5e into eclair

Merge commit 'f1e80834961948f18dd07ea26ac385b521454682'

* commit 'f1e80834961948f18dd07ea26ac385b521454682':
  New assets for settings

14 years agoam fb90e5e4: am 322c39b5: Merge change I0d0fa17a into eclair
Steve Block [Thu, 1 Oct 2009 18:58:58 +0000 (11:58 -0700)]
am fb90e5e4: am 322c39b5: Merge change I0d0fa17a into eclair

Merge commit 'fb90e5e4e33ee6f583414ac528141f511f22a199'

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

14 years agoam 0794e4ad: am 1336e6da: Remove unused assets.
Leon Scroggins [Thu, 1 Oct 2009 18:58:50 +0000 (11:58 -0700)]
am 0794e4ad: am 1336e6da: Remove unused assets.

Merge commit '0794e4ad35d66a273184a158b773a5dd5398b7f7'

* commit '0794e4ad35d66a273184a158b773a5dd5398b7f7':
  Remove unused assets.

14 years agoam 19bd5c8a: am f59fb4ef: Merge change I417aa61d into eclair
Leon Scroggins [Thu, 1 Oct 2009 18:57:58 +0000 (11:57 -0700)]
am 19bd5c8a: am f59fb4ef: Merge change I417aa61d into eclair

Merge commit '19bd5c8a78337008d0f8369e73472926c966e10b'

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

14 years agoam 1c8cd377: am 306feaf5: Merge change Ibf40bd9e into eclair
Leon Scroggins [Thu, 1 Oct 2009 18:57:52 +0000 (11:57 -0700)]
am 1c8cd377: am 306feaf5: Merge change Ibf40bd9e into eclair

Merge commit '1c8cd3772ee62d5f44daba9a51ed8b6757e52500'

* commit '1c8cd3772ee62d5f44daba9a51ed8b6757e52500':
  Slide the title bar onto the screen rather than stretching it.

14 years agoam b3482d77: am bd955bf1: Merge change I834ba6d2 into eclair
Ben Murdoch [Thu, 1 Oct 2009 18:57:47 +0000 (11:57 -0700)]
am b3482d77: am bd955bf1: Merge change I834ba6d2 into eclair

Merge commit 'b3482d77a796ef46678639d2e914cd5a8f4fd799'

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

14 years agoam aedc94ea: am cbd20bf6: Merge change I7cb3951e into eclair
Steve Block [Thu, 1 Oct 2009 18:57:40 +0000 (11:57 -0700)]
am aedc94ea: am cbd20bf6: Merge change I7cb3951e into eclair

Merge commit 'aedc94ea3b427ef721a347a93f8ca64ed895e2ae'

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

14 years agoam 7f086fcf: am 1794fe25: Save a new bookmark to the bookmarks DB asynchronously...
Ben Murdoch [Thu, 1 Oct 2009 18:56:36 +0000 (11:56 -0700)]
am 7f086fcf: am 1794fe25: Save a new bookmark to the bookmarks DB asynchronously. Fix for bug 2151093.

Merge commit '7f086fcf34911d31d627887b7e453308a4214b85'

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

14 years agoam ebc8ef4a: am 9957024e: Merge change Ic78ed87e into eclair
Steve Block [Thu, 1 Oct 2009 18:56:24 +0000 (11:56 -0700)]
am ebc8ef4a: am 9957024e: Merge change Ic78ed87e into eclair

Merge commit 'ebc8ef4a12ff9efc77c6c372b2a16516fe73670c'

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

14 years agoam f866b1c1: am cb6cc864: Link coloring - do db lookup in new thread
Leon Clarke [Thu, 1 Oct 2009 18:55:29 +0000 (11:55 -0700)]
am f866b1c1: am cb6cc864: Link coloring - do db lookup in new thread

Merge commit 'f866b1c17da52570106570bf3788429a262d4b43'

* commit 'f866b1c17da52570106570bf3788429a262d4b43':
  Link coloring - do db lookup in new thread

14 years agoam a24066c5: am ab1fc3ba: Newer icons
Mike Cleron [Thu, 1 Oct 2009 18:53:57 +0000 (11:53 -0700)]
am a24066c5: am ab1fc3ba: Newer icons

Merge commit 'a24066c5b08c00a92b3a0cc5e616d6f3c608e65d'

* commit 'a24066c5b08c00a92b3a0cc5e616d6f3c608e65d':
  Newer icons

14 years agoam bcff5e7d: am 1208723c: New hdpi assets.
Daniel Sandler [Thu, 1 Oct 2009 18:48:52 +0000 (11:48 -0700)]
am bcff5e7d: am 1208723c: New hdpi assets.

Merge commit 'bcff5e7d8fb81df340a1f073ed851cdf1054d150'

* commit 'bcff5e7d8fb81df340a1f073ed851cdf1054d150':
  New hdpi assets.

14 years agoam 1fb12a7a: am 1e705056: Check null for intent.getData() before using it.
Grace Kloba [Thu, 1 Oct 2009 18:37:20 +0000 (11:37 -0700)]
am 1fb12a7a: am 1e705056: Check null for intent.getData() before using it.

Merge commit '1fb12a7a54dd4fe0f1f4b4a128d40ab2c680c9fd'

* commit '1fb12a7a54dd4fe0f1f4b4a128d40ab2c680c9fd':
  Check null for intent.getData() before using it.

14 years agoam f82dfdd0: am 380ac10b: Merge change Id9898b22 into eclair
Leon Scroggins [Thu, 1 Oct 2009 18:36:06 +0000 (11:36 -0700)]
am f82dfdd0: am 380ac10b: Merge change Id9898b22 into eclair

Merge commit 'f82dfdd0fe7237434519c6d468c11a293cf63301'

* commit 'f82dfdd0fe7237434519c6d468c11a293cf63301':
  Check to make sure the captured picture is non null before using.

14 years agoskipping for now
Android Git Automerger [Thu, 1 Oct 2009 18:28:52 +0000 (11:28 -0700)]
skipping for now

Merge commit 'a292b731'

14 years agoam b33f375c: am 3a226f7c: Merge change Iffca70f6 into eclair
Christopher Tate [Thu, 1 Oct 2009 18:19:28 +0000 (11:19 -0700)]
am b33f375c: am 3a226f7c: Merge change Iffca70f6 into eclair

Merge commit 'b33f375ca37b2ebf6ce3b94812b55d7414ec36a7'

* commit 'b33f375ca37b2ebf6ce3b94812b55d7414ec36a7':
  Reduce browser backup agent's amount of logging

14 years agoam d488c262: am 3f68d272: Updates for the title bar.
Leon Scroggins [Thu, 1 Oct 2009 18:17:51 +0000 (11:17 -0700)]
am d488c262: am 3f68d272: Updates for the title bar.

Merge commit 'd488c262275cb0f7e9e20bc8fac29b0636b7e1da'

* commit 'd488c262275cb0f7e9e20bc8fac29b0636b7e1da':
  Updates for the title bar.

14 years agoam 117b9b1a: am 5d590de2: Merge change I237fc084 into eclair
Steve Block [Thu, 1 Oct 2009 18:17:27 +0000 (11:17 -0700)]
am 117b9b1a: am 5d590de2: Merge change I237fc084 into eclair

Merge commit '117b9b1a772934983391fad38ae9c4086b8bd080'

* commit '117b9b1a772934983391fad38ae9c4086b8bd080':
  Makes Geolocation permissions prompt pretty.

14 years agoam de993c10: am 458c81a3: Merge change I67f0a56d into eclair
Grace Kloba [Thu, 1 Oct 2009 18:16:55 +0000 (11:16 -0700)]
am de993c10: am 458c81a3: Merge change I67f0a56d into eclair

Merge commit 'de993c100a90a6dcb4e7921ad5e9aaf29a75fb56'

* commit 'de993c100a90a6dcb4e7921ad5e9aaf29a75fb56':
  Enable fading scrollbar for the Browser

14 years agoam d5b2cea1: am a0464554: don\'t create the fake title bar when getGlobalVisible...
Cary Clark [Thu, 1 Oct 2009 18:14:49 +0000 (11:14 -0700)]
am d5b2cea1: am a0464554: don\'t create the fake title bar when getGlobalVisible fails

Merge commit 'd5b2cea14d51b52f3a25282b0405adb9dc7310e4'

* commit 'd5b2cea14d51b52f3a25282b0405adb9dc7310e4':
  don't create the fake title bar when getGlobalVisible fails

14 years agoam 055fa60f: am 2694e23a: Fix miniature thumbnail problem and delay saving of a scree...
Ben Murdoch [Thu, 1 Oct 2009 18:12:47 +0000 (11:12 -0700)]
am 055fa60f: am 2694e23a: 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.

Merge commit '055fa60f57c6ec481acba47ed0367566ede9eaab'

* commit '055fa60f57c6ec481acba47ed0367566ede9eaab':
  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.

14 years agoam 53786b99: am c46f828c: New icons
Mike Cleron [Thu, 1 Oct 2009 18:10:49 +0000 (11:10 -0700)]
am 53786b99: am c46f828c: New icons

Merge commit '53786b993c4a0ebb06ce6b4e80223b59b19bf8e2'

* commit '53786b993c4a0ebb06ce6b4e80223b59b19bf8e2':
  New icons

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