OSDN Git Service

android-x86/packages-apps-Browser.git
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 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.

14 years agoMerge change Ic78ed87e into eclair
Android (Google) Code Review [Wed, 30 Sep 2009 14:09:38 +0000 (10:09 -0400)]
Merge change Ic78ed87e into eclair

* changes:
  Changes "New York Times" to "NY Times" in bookmarks list.

14 years agoRemoves the list of values previously used when prompting the user to increase the...
Steve Block [Wed, 30 Sep 2009 13:58:51 +0000 (14:58 +0100)]
Removes the list of values previously used when prompting the user to increase the HTML5 database quota.

These values are superfluous, as the user is no longer prompted in this way.

Change-Id: I7cb3951e26091df24736fe1cf26636fdee3d79dc

14 years agoChanges "New York Times" to "NY Times" in bookmarks list.
Steve Block [Wed, 30 Sep 2009 09:46:44 +0000 (10:46 +0100)]
Changes "New York Times" to "NY Times" in bookmarks list.

This is part of the fix for http://b/issue?id=2155414.
Also requires changes to vendor-specific strings.

Change-Id: Ic78ed87ebbe33a73fac6635b885b2c9d3113cbce

14 years agoam cb6cc864: Link coloring - do db lookup in new thread
Leon Clarke [Wed, 30 Sep 2009 10:16:24 +0000 (03:16 -0700)]
am cb6cc864: Link coloring - do db lookup in new thread

Merge commit 'cb6cc864e53f7d916622daf3b2cec133b36d6a55' into eclair-plus-aosp

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

14 years agoLink coloring - do db lookup in new thread
Leon Clarke [Tue, 29 Sep 2009 17:35:13 +0000 (18:35 +0100)]
Link coloring - do db lookup in new thread

Typo
(cherry picked from commit ccfb951aa11cfdd7ec8ac97e6003193a1a1d7d5b)

Conflicts:

src/com/android/browser/BrowserActivity.java

14 years agoam ab1fc3ba: Newer icons
Mike Cleron [Wed, 30 Sep 2009 08:40:47 +0000 (01:40 -0700)]
am ab1fc3ba: Newer icons

Merge commit 'ab1fc3ba06e40b64910406ba848de212401e6c34' into eclair-plus-aosp

* commit 'ab1fc3ba06e40b64910406ba848de212401e6c34':
  Newer icons

14 years agoNewer icons
Mike Cleron [Wed, 30 Sep 2009 08:10:05 +0000 (01:10 -0700)]
Newer icons

14 years agoam 1208723c: New hdpi assets.
Daniel Sandler [Wed, 30 Sep 2009 04:40:24 +0000 (21:40 -0700)]
am 1208723c: New hdpi assets.

Merge commit '1208723c787f42050c28e2278c6567c67de142d0' into eclair-plus-aosp

* commit '1208723c787f42050c28e2278c6567c67de142d0':
  New hdpi assets.

14 years agoNew hdpi assets.
Daniel Sandler [Wed, 30 Sep 2009 04:33:22 +0000 (00:33 -0400)]
New hdpi assets.

Drop dated 29-Sep-2009.

Change-Id: I49bda866e8d96bafa31b601d4842e7f2a4514e9f

14 years agoam 1e705056: Check null for intent.getData() before using it.
Grace Kloba [Tue, 29 Sep 2009 21:32:29 +0000 (14:32 -0700)]
am 1e705056: Check null for intent.getData() before using it.

Merge commit '1e70505659dd9bf0f7e03bce787ba880f9b7a8aa' into eclair-plus-aosp

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

14 years agoCheck null for intent.getData() before using it.
Grace Kloba [Tue, 29 Sep 2009 20:13:36 +0000 (13:13 -0700)]
Check null for intent.getData() before using it.

Fix http://b/issue?id=2151485

14 years agoam 380ac10b: Merge change Id9898b22 into eclair
Leon Scroggins [Tue, 29 Sep 2009 20:56:58 +0000 (13:56 -0700)]
am 380ac10b: Merge change Id9898b22 into eclair

Merge commit '380ac10b1c694f791fa75b6f29493954b2596bd8' into eclair-plus-aosp

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

14 years agoMerge change Id9898b22 into eclair
Android (Google) Code Review [Tue, 29 Sep 2009 20:52:19 +0000 (16:52 -0400)]
Merge change Id9898b22 into eclair

* changes:
  Check to make sure the captured picture is non null before using.

14 years agoCheck to make sure the captured picture is non null before using.
Leon Scroggins [Tue, 29 Sep 2009 20:38:47 +0000 (16:38 -0400)]
Check to make sure the captured picture is non null before using.

Fixes http://b/issue?id=2154493

Change-Id: Id9898b2251585e8adbae286df6173a2e1989c838

14 years agoam 49a33f8c: Merge change I776878e9 into eclair
Cary Clark [Tue, 29 Sep 2009 19:51:12 +0000 (12:51 -0700)]
am 49a33f8c: Merge change I776878e9 into eclair

Merge commit '49a33f8ca0ad04c57362edaf0692e9e3bffa1177' into eclair-plus-aosp

* commit '49a33f8ca0ad04c57362edaf0692e9e3bffa1177':
  Add '&android-home' to the google homepage string

14 years agoam 3a226f7c: Merge change Iffca70f6 into eclair
Christopher Tate [Tue, 29 Sep 2009 19:51:09 +0000 (12:51 -0700)]
am 3a226f7c: Merge change Iffca70f6 into eclair

Merge commit '3a226f7c9f6d3ef8b2c44b9863512e6b3e374f9c' into eclair-plus-aosp

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

14 years agoMerge change I776878e9 into eclair
Android (Google) Code Review [Tue, 29 Sep 2009 19:45:29 +0000 (15:45 -0400)]
Merge change I776878e9 into eclair

* changes:
  Add '&android-home' to the google homepage string

14 years agoMerge change Iffca70f6 into eclair
Android (Google) Code Review [Tue, 29 Sep 2009 19:43:35 +0000 (15:43 -0400)]
Merge change Iffca70f6 into eclair

* changes:
  Reduce browser backup agent's amount of logging

14 years agoReduce browser backup agent's amount of logging
Christopher Tate [Tue, 29 Sep 2009 19:40:25 +0000 (12:40 -0700)]
Reduce browser backup agent's amount of logging

DEBUG=false now, and so we emit only one-line activity summaries during backup
and restore.

Change-Id: Iffca70f60581672ce686429db0a4382d934de663

14 years agoAdd '&android-home' to the google homepage string
Cary Clark [Tue, 29 Sep 2009 19:12:03 +0000 (15:12 -0400)]
Add '&android-home' to the google homepage string

Also, mark it as non-translatable, and remove the translated
versions.

fixes http://b/issue?id=2148022

14 years agoam 3f68d272: Updates for the title bar.
Leon Scroggins [Tue, 29 Sep 2009 19:06:26 +0000 (12:06 -0700)]
am 3f68d272: Updates for the title bar.

Merge commit '3f68d2722de5d4b848adc40662f9ead6e64235e5' into eclair-plus-aosp

* commit '3f68d2722de5d4b848adc40662f9ead6e64235e5':
  Updates for the title bar.

14 years agoUpdates for the title bar.
Leon Scroggins [Tue, 29 Sep 2009 17:08:35 +0000 (13:08 -0400)]
Updates for the title bar.

Modify the layout of the title bar to better match that of the
search bar.  Also use the newer asset for the bookmarks button.

See http://b/issue?id=2126429 and http://b/issue?id=2145205

Change-Id: I14f05ca00a30f67d59d407ac3f6dfb2ac63a8184

14 years agoam 5d590de2: Merge change I237fc084 into eclair
Steve Block [Tue, 29 Sep 2009 18:37:09 +0000 (11:37 -0700)]
am 5d590de2: Merge change I237fc084 into eclair

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

* commit '5d590de2d2d6338de0a516718bec4d390355a0af':
  Makes Geolocation permissions prompt pretty.

14 years agoMerge change I237fc084 into eclair
Android (Google) Code Review [Tue, 29 Sep 2009 18:31:29 +0000 (14:31 -0400)]
Merge change I237fc084 into eclair

* changes:
  Makes Geolocation permissions prompt pretty.

14 years agoam 458c81a3: Merge change I67f0a56d into eclair
Grace Kloba [Tue, 29 Sep 2009 18:14:48 +0000 (11:14 -0700)]
am 458c81a3: Merge change I67f0a56d into eclair

Merge commit '458c81a357d078f8fcb701f27a287c9e634903a7' into eclair-plus-aosp

* commit '458c81a357d078f8fcb701f27a287c9e634903a7':
  Enable fading scrollbar for the Browser

14 years agoMakes Geolocation permissions prompt pretty.
Steve Block [Tue, 29 Sep 2009 12:14:41 +0000 (13:14 +0100)]
Makes Geolocation permissions prompt pretty.

Change-Id: I237fc0845de2297babc7da448a2199c5344e2e83

14 years agoam e506ffd6: am 65f4a3ce: check to see if the real title bar has no parent
Cary Clark [Tue, 29 Sep 2009 18:09:17 +0000 (11:09 -0700)]
am e506ffd6: am 65f4a3ce: check to see if the real title bar has no parent

Merge commit 'e506ffd632750892e5f42ac7497b7469bba0d20f'

* commit 'e506ffd632750892e5f42ac7497b7469bba0d20f':
  check to see if the real title bar has no parent

14 years agoam c5313b54: am 8d19cb8f: More assets refresh.
Leon Scroggins [Tue, 29 Sep 2009 18:06:59 +0000 (11:06 -0700)]
am c5313b54: am 8d19cb8f: More assets refresh.

Merge commit 'c5313b54d08c08c6d2582d72be7eb35358b16140'

* commit 'c5313b54d08c08c6d2582d72be7eb35358b16140':
  More assets refresh.

14 years agoam 0bf34e4f: am f6e05ba4: Use new bookmark assets.
Leon Scroggins [Tue, 29 Sep 2009 18:06:33 +0000 (11:06 -0700)]
am 0bf34e4f: am f6e05ba4: Use new bookmark assets.

Merge commit '0bf34e4f5f273cc55abad4f951c736d9a2e26377'

* commit '0bf34e4f5f273cc55abad4f951c736d9a2e26377':
  Use new bookmark assets.

14 years agoMerge change I67f0a56d into eclair
Android (Google) Code Review [Tue, 29 Sep 2009 18:05:48 +0000 (14:05 -0400)]
Merge change I67f0a56d into eclair

* changes:
  Enable fading scrollbar for the Browser

14 years agoam a0464554: don\'t create the fake title bar when getGlobalVisible fails
Cary Clark [Tue, 29 Sep 2009 17:24:11 +0000 (10:24 -0700)]
am a0464554: don\'t create the fake title bar when getGlobalVisible fails

Merge commit 'a04645545690d9f637ccae4d043a5a1b8478a832' into eclair-plus-aosp

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

14 years agodon't create the fake title bar when getGlobalVisible fails
Cary Clark [Tue, 29 Sep 2009 17:00:45 +0000 (13:00 -0400)]
don't create the fake title bar when getGlobalVisible fails

If getGlobalVisibleFails, the visible rectangle top is
assumed to be zero, as if the status bar has no height. The
fake title bar is then drawn underneath the actual status
bar. Bail on the fake title bar creation if the status bar
can't be measured.

14 years agoam 2694e23a: Fix miniature thumbnail problem and delay saving of a screenshot by...
Ben Murdoch [Tue, 29 Sep 2009 15:04:24 +0000 (08:04 -0700)]
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 '2694e23a55d5ca526fc29534a80a200e2c58698b' into eclair-plus-aosp

* commit '2694e23a55d5ca526fc29534a80a200e2c58698b':
  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 agoFix miniature thumbnail problem and delay saving of a screenshot by 500ms after a...
Ben Murdoch [Tue, 29 Sep 2009 08:41:11 +0000 (09:41 +0100)]
Fix miniature thumbnail problem and delay saving of a screenshot by 500ms after a page has completed loading to ensure the WebView has completed painting and that we therefore save an accurate thumbnail.

Change-Id: I77f5d12062de0b9703e5d3ec0c53910f4d62743d

14 years agoam c46f828c: New icons
Mike Cleron [Tue, 29 Sep 2009 07:00:53 +0000 (00:00 -0700)]
am c46f828c: New icons

Merge commit 'c46f828c17e8f171aa62910cba7ba6af6f7302ae' into eclair-plus-aosp

* commit 'c46f828c17e8f171aa62910cba7ba6af6f7302ae':
  New icons

14 years agoNew icons
Mike Cleron [Tue, 29 Sep 2009 06:50:30 +0000 (23:50 -0700)]
New icons

14 years agoEnable fading scrollbar for the Browser
Grace Kloba [Tue, 29 Sep 2009 04:24:51 +0000 (21:24 -0700)]
Enable fading scrollbar for the Browser

Fix http://b/issue?id=2151115

14 years agoam 65f4a3ce: check to see if the real title bar has no parent
Cary Clark [Mon, 28 Sep 2009 21:21:32 +0000 (14:21 -0700)]
am 65f4a3ce: check to see if the real title bar has no parent

Merge commit '65f4a3ce9e5c4a5227bbcbb995e5e15f1f85d3d7' into eclair-plus-aosp

* commit '65f4a3ce9e5c4a5227bbcbb995e5e15f1f85d3d7':
  check to see if the real title bar has no parent

14 years agocheck to see if the real title bar has no parent
Cary Clark [Mon, 28 Sep 2009 21:05:06 +0000 (17:05 -0400)]
check to see if the real title bar has no parent

This works around a monkey-found crash that is unlikely to
be triggerable by a user.

Fixes http://b/issue?id=2150746

14 years agoam 8d19cb8f: More assets refresh.
Leon Scroggins [Mon, 28 Sep 2009 20:13:25 +0000 (13:13 -0700)]
am 8d19cb8f: More assets refresh.

Merge commit '8d19cb8f08e8094d6eb4fd879c81a17c46b36cad' into eclair-plus-aosp

* commit '8d19cb8f08e8094d6eb4fd879c81a17c46b36cad':
  More assets refresh.

14 years agoam f6e05ba4: Use new bookmark assets.
Leon Scroggins [Mon, 28 Sep 2009 19:59:11 +0000 (12:59 -0700)]
am f6e05ba4: Use new bookmark assets.

Merge commit 'f6e05ba45ce286887fca129d45416fa91f3724ad' into eclair-plus-aosp

* commit 'f6e05ba45ce286887fca129d45416fa91f3724ad':
  Use new bookmark assets.

14 years agoMore assets refresh.
Leon Scroggins [Mon, 28 Sep 2009 19:56:52 +0000 (15:56 -0400)]
More assets refresh.

Change-Id: Ieb591dd057d36919daea4578d0c15bcc896b5672

14 years agoUse new bookmark assets.
Leon Scroggins [Mon, 28 Sep 2009 19:30:44 +0000 (15:30 -0400)]
Use new bookmark assets.

Use the latest assets for the bookmark menu option, as well as for
the bookmark tab on the bookmarks page.

Fixes http://b/issue?id=2145205

Change-Id: Ic36ce791a9352be2a175f5affba32873b4854d8e

14 years agoam 55a00517: am 88fa35e4: Merge change 27451 into eclair
Nicolas Roard [Mon, 28 Sep 2009 17:47:04 +0000 (10:47 -0700)]
am 55a00517: am 88fa35e4: Merge change 27451 into eclair

Merge commit '55a00517c0842590ace2e6c7c8eff28ea1204401'

* commit '55a00517c0842590ace2e6c7c8eff28ea1204401':
  Fix for the dual notification problem

14 years agoam 25b9964e: am 29a6b734: Merge change 27460 into eclair
Leon Scroggins [Mon, 28 Sep 2009 17:47:00 +0000 (10:47 -0700)]
am 25b9964e: am 29a6b734: Merge change 27460 into eclair

Merge commit '25b9964eda22e5527c281ca78ef9c1d5962b5555'

* commit '25b9964eda22e5527c281ca78ef9c1d5962b5555':
  Update menu items.

14 years agoam 88fa35e4: Merge change 27451 into eclair
Nicolas Roard [Mon, 28 Sep 2009 17:42:07 +0000 (10:42 -0700)]
am 88fa35e4: Merge change 27451 into eclair

Merge commit '88fa35e452de655e85ad702b74cc1447d8228711' into eclair-plus-aosp

* commit '88fa35e452de655e85ad702b74cc1447d8228711':
  Fix for the dual notification problem

14 years agoam 29a6b734: Merge change 27460 into eclair
Leon Scroggins [Mon, 28 Sep 2009 17:42:04 +0000 (10:42 -0700)]
am 29a6b734: Merge change 27460 into eclair

Merge commit '29a6b73472c2876a958b2d171b3cdb5e912254df' into eclair-plus-aosp

* commit '29a6b73472c2876a958b2d171b3cdb5e912254df':
  Update menu items.

14 years agoMerge change 27451 into eclair
Android (Google) Code Review [Mon, 28 Sep 2009 17:37:06 +0000 (13:37 -0400)]
Merge change 27451 into eclair

* changes:
  Fix for the dual notification problem

14 years agoMerge change 27460 into eclair
Android (Google) Code Review [Mon, 28 Sep 2009 17:36:37 +0000 (13:36 -0400)]
Merge change 27460 into eclair

* changes:
  Update menu items.