Commit Graph

5087 Commits

Author SHA1 Message Date
Robert Greenwalt
755a4ac471 am 66fdd84e: Merge change 25775 into eclair
Merge commit '66fdd84e28a0619b7981ca00f2f2cd7681dbc82d' into eclair-plus-aosp

* commit '66fdd84e28a0619b7981ca00f2f2cd7681dbc82d':
  Fix typo in SECONDARY_DATA_RETRY_CONFIG
2009-09-18 12:02:59 -07:00
Chih-Chung Chang
5b9dc1a2af am f22b7410: Merge change 25464 into eclair
Merge commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776' into eclair-plus-aosp

* commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776':
  Improve ExifInterface API.
2009-09-18 12:02:50 -07:00
Android (Google) Code Review
10d63060b2 Merge change 25775 into eclair
* changes:
  Fix typo in SECONDARY_DATA_RETRY_CONFIG
2009-09-18 14:53:46 -04:00
Android (Google) Code Review
18a2cc4ca0 Merge change 25464 into eclair
* changes:
  Improve ExifInterface API.
2009-09-18 14:38:38 -04:00
Andrei Popescu
485f28ccf8 am fd49faae: Merge change 25772 into eclair
Merge commit 'fd49faae33dc813c93347d1bcc8fa7c4fa0ae55d' into eclair-plus-aosp

* commit 'fd49faae33dc813c93347d1bcc8fa7c4fa0ae55d':
  Add progress view and default poster for the <video> implementation
2009-09-18 11:28:48 -07:00
Nick Pelly
cf0d2c3c7e am 93727454: Merge change 25768 into eclair
Merge commit '93727454caf1b3540a352328abd0400c2242902b' into eclair-plus-aosp

* commit '93727454caf1b3540a352328abd0400c2242902b':
  Add one line of logging when SCO SOCKET connect starts.
2009-09-18 11:28:41 -07:00
Android (Google) Code Review
97e1023344 Merge change 25772 into eclair
* changes:
  Add progress view and default poster for the <video> implementation
2009-09-18 14:22:01 -04:00
Android (Google) Code Review
06657708ac Merge change 25768 into eclair
* changes:
  Add one line of logging when SCO SOCKET connect starts.
2009-09-18 13:29:34 -04:00
Dianne Hackborn
00621b2440 am ffda371c: Merge change 25734 into eclair
Merge commit 'ffda371c220de9c97663fef4e9d14bee7267383d' into eclair-plus-aosp

* commit 'ffda371c220de9c97663fef4e9d14bee7267383d':
  Show the live wallpaper on the lock screen.
2009-09-18 10:25:46 -07:00
Android (Google) Code Review
70f6243ea2 Merge change 25734 into eclair
* changes:
  Show the live wallpaper on the lock screen.
2009-09-18 13:16:30 -04:00
Scott Main
d0e33b3368 am a120d482: Merge change 25644 into eclair
Merge commit 'a120d4820d1c40a113fb9f46e996299eaa22ea04' into eclair-plus-aosp

* commit 'a120d4820d1c40a113fb9f46e996299eaa22ea04':
  add Eclair to the droiddoc 'since' options so that we
2009-09-18 10:07:10 -07:00
Leon Scroggins
6c247e6836 am 83d4ba83: Do not attempt to retry a scrollTo with a negative position.
Merge commit '83d4ba83ddf8309d2c0c38d69154217d6a9c0a6c' into eclair-plus-aosp

* commit '83d4ba83ddf8309d2c0c38d69154217d6a9c0a6c':
  Do not attempt to retry a scrollTo with a negative position.
2009-09-18 10:02:13 -07:00
Android (Google) Code Review
236d32c694 Merge change 25644 into eclair
* changes:
  add Eclair to the droiddoc 'since' options so that we can see API Level diffs in the docs.
2009-09-18 13:01:05 -04:00
Grace Kloba
3c2e55045a am 6ed525ec: When a WebView starts, we may get first layout before viewSizeChanged() ever get called. Call WebView\'s getViewWidth() to get the current UI width. If it is still 0, log a warning.
Merge commit '6ed525ecee76541aa60ca95598330e990fa16ffa' into eclair-plus-aosp

* commit '6ed525ecee76541aa60ca95598330e990fa16ffa':
  When a WebView starts, we may get first layout before viewSizeChanged()
2009-09-18 09:29:10 -07:00
Tom Taylor
175583b84e am da05aa82: Merge change 25666 into eclair
Merge commit 'da05aa828853964dccd185f6a7f5ca72cc0d3573' into eclair-plus-aosp

* commit 'da05aa828853964dccd185f6a7f5ca72cc0d3573':
  Save message size
2009-09-18 09:18:49 -07:00
Android (Google) Code Review
ea9aee7676 Merge change 25666 into eclair
* changes:
  Save message size
2009-09-18 12:11:28 -04:00
Leon Scroggins
894f5253e5 am 58992eac: Draw shadow below title, or at top if title is off screen.
Merge commit '58992eac8373ba7260d99dd832a6fc9e3d164460' into eclair-plus-aosp

* commit '58992eac8373ba7260d99dd832a6fc9e3d164460':
  Draw shadow below title, or at top if title is off screen.
2009-09-18 08:02:20 -07:00
Bryan Mawhinney
1820e2bb7b am dfcbc046: Reserve space for the searchbox spinner, even when stopped.
Merge commit 'dfcbc046d7fcd74c8aacd9f26bd48084900d3b4a' into eclair-plus-aosp

* commit 'dfcbc046d7fcd74c8aacd9f26bd48084900d3b4a':
  Reserve space for the searchbox spinner, even when stopped.
2009-09-18 05:16:11 -07:00
Jeff Sharkey
bbe451b68b am 0050ee36: Adopt new FastTrack API for internal widget, fix bugs.
Merge commit '0050ee36398c3ab6e5f1ee0038609aff8cf4f0e9' into eclair-plus-aosp

* commit '0050ee36398c3ab6e5f1ee0038609aff8cf4f0e9':
  Adopt new FastTrack API for internal widget, fix bugs.
2009-09-18 00:15:12 -07:00
Yu Shan Emily Lau
53b917f190 am b39dcb79: Merge change 25722 into eclair
Merge commit 'b39dcb796ddf40fb87724ac28932a687756c91bd' into eclair-plus-aosp

* commit 'b39dcb796ddf40fb87724ac28932a687756c91bd':
  Modified the validation to use singal media player instance.
2009-09-18 00:00:05 -07:00
Eric Laurent
fc3cf859ec am 2925b8c6: Merge change 25496 into eclair
Merge commit '2925b8c62a03381e5b3ff159847e8312ae9dfee5' into eclair-plus-aosp

* commit '2925b8c62a03381e5b3ff159847e8312ae9dfee5':
  Fix issue 2127371: Possible race condition in AudioFlinger::openRecord() when a Track is being destroyed.
2009-09-17 23:59:57 -07:00
Android (Google) Code Review
81e204de8b Merge change 25722 into eclair
* changes:
  Modified the validation to use singal media player instance.
2009-09-18 02:55:53 -04:00
Android (Google) Code Review
5cfbb8dd1c Merge change 25496 into eclair
* changes:
  Fix issue 2127371: Possible race condition in AudioFlinger::openRecord() when a Track is being destroyed.
2009-09-18 02:55:00 -04:00
Yu Shan Emily Lau
bbbe1373a2 am 56af9e9f: Merge change 25452 into eclair
Merge commit '56af9e9f9cbc3626acf55558d581efd2de3caa03' into eclair-plus-aosp

* commit '56af9e9f9cbc3626acf55558d581efd2de3caa03':
  Modified the new stream video url.
2009-09-17 23:28:09 -07:00
Android (Google) Code Review
b68b346946 Merge change 25452 into eclair
* changes:
  Modified the new stream video url.
2009-09-18 02:20:43 -04:00
Chia-chi Yeh
aea5032cde am 8ed86d2b: Merge change 25717 into eclair
Merge commit '8ed86d2b463be60d65e86aac33550d8fc84bd2a5' into eclair-plus-aosp

* commit '8ed86d2b463be60d65e86aac33550d8fc84bd2a5':
  CertTool: avoid using final static array.
2009-09-17 23:03:53 -07:00
Android (Google) Code Review
b3f93c06cf Merge change 25717 into eclair
* changes:
  CertTool: avoid using final static array.
2009-09-18 01:57:38 -04:00
Chia-chi Yeh
edc8757d91 am 794d36c6: Merge change 25706 into eclair
Merge commit '794d36c6c6b00fc93a4f185525d2fe84cdc99f8c' into eclair-plus-aosp

* commit '794d36c6c6b00fc93a4f185525d2fe84cdc99f8c':
  WebKit: switch to java-based CertTool.
2009-09-17 21:53:54 -07:00
Chia-chi Yeh
e763bdf3e6 am f0580b98: Merge change 25705 into eclair
Merge commit 'f0580b980b3b1f1caaf735e2a34887e7c8b49726' into eclair-plus-aosp

* commit 'f0580b980b3b1f1caaf735e2a34887e7c8b49726':
  Add a helper class to send out credentials.
2009-09-17 21:53:45 -07:00
Chia-chi Yeh
a45bde13db am adf375b5: Merge change 25684 into eclair
Merge commit 'adf375b5ad605b09266acbfcb3297753cf0f5278' into eclair-plus-aosp

* commit 'adf375b5ad605b09266acbfcb3297753cf0f5278':
  keystore: add multi-user support.
2009-09-17 21:53:36 -07:00
Android (Google) Code Review
54f7563b3e Merge change 25706 into eclair
* changes:
  WebKit: switch to java-based CertTool.
2009-09-18 00:45:09 -04:00
Android (Google) Code Review
71f9b874e9 Merge change 25705 into eclair
* changes:
  Add a helper class to send out credentials.
2009-09-18 00:44:48 -04:00
Android (Google) Code Review
2bd907193e Merge change 25684 into eclair
* changes:
  keystore: add multi-user support.
2009-09-18 00:44:00 -04:00
Chia-chi Yeh
4cff21f21b keystore: add multi-user support.
Change-Id: I60268261110934a1d60efa341ff530f94415724f
2009-09-18 11:49:55 +08:00
Mathias Agopian
bf9e0d9bf0 am ac7f13bc: fix [2129080] Soft reboot after clicking around and then rubbing the screen
Merge commit 'ac7f13bc1ac8af99093987ebcb811f3892b49296' into eclair-plus-aosp

* commit 'ac7f13bc1ac8af99093987ebcb811f3892b49296':
  fix [2129080] Soft reboot after clicking around and then rubbing the screen
2009-09-17 19:30:48 -07:00
Mathias Agopian
6d9f69843b fix [2129080] Soft reboot after clicking around and then rubbing the screen 2009-09-17 19:23:59 -07:00
Daisuke Miyakawa
337e0495c6 am cd25c56a: Merge change 25636 into eclair
Merge commit 'cd25c56ad442fd5574c1fa49e0d443a80551ee1f' into eclair-plus-aosp

* commit 'cd25c56ad442fd5574c1fa49e0d443a80551ee1f':
  Add each contact in vCard into "My Groups" if account is for Google's and it has such a group.
2009-09-17 18:56:55 -07:00
Dianne Hackborn
5d6f6134a8 am ae22c05b: Try to fix docs build.
Merge commit 'ae22c05b91d1e7a458066792eb5cfc0974c1be9e' into eclair-plus-aosp

* commit 'ae22c05b91d1e7a458066792eb5cfc0974c1be9e':
  Try to fix docs build.
2009-09-17 18:52:12 -07:00
Android (Google) Code Review
84adf49fa1 Merge change 25636 into eclair
* changes:
  Add each contact in vCard into "My Groups" if account is for Google's and it has such a group. This fix should be temporal. Should be fixed in the near future.
2009-09-17 21:51:26 -04:00
Dianne Hackborn
6764e75c01 am fa82f22f: Fix issue #2093608: Calendar widget takes a few seconds to launch
Merge commit 'fa82f22f1d8c4c828bdf9b670006be4f4fec772e' into eclair-plus-aosp

* commit 'fa82f22f1d8c4c828bdf9b670006be4f4fec772e':
  Fix issue #2093608: Calendar widget takes a few seconds to launch
2009-09-17 18:13:26 -07:00
Karl Rosaen
4e656f26a7 am 9b64ef13: Merge change 25647 into eclair
Merge commit '9b64ef133c1eb24c8d00aa7e46ec86c544af5fe2' into eclair-plus-aosp

* commit '9b64ef133c1eb24c8d00aa7e46ec86c544af5fe2':
  Some tweaks to the rotary lock widget.
2009-09-17 17:51:42 -07:00
Mathias Agopian
4ff7314db2 am 39a5ba90: Merge change 25629 into eclair
Merge commit '39a5ba90a4939cfdd23ecd10f73a77a75679b13e' into eclair-plus-aosp

* commit '39a5ba90a4939cfdd23ecd10f73a77a75679b13e':
  Android side of the fix for [2121211] Sholes has stutter during animations
2009-09-17 17:44:12 -07:00
Android (Google) Code Review
817cfefe10 Merge change 25647 into eclair
* changes:
  Some tweaks to the rotary lock widget.
2009-09-17 20:43:53 -04:00
Android (Google) Code Review
fd1f4261b7 Merge change 25629 into eclair
* changes:
  Android side of the fix for [2121211] Sholes has stutter during animations
2009-09-17 20:36:24 -04:00
Fred Quintana
6f6649c310 am 2b1e6779: Merge change 25639 into eclair
Merge commit '2b1e67790bf101b2d65e0b38c8b0f3b8676d0129' into eclair-plus-aosp

* commit '2b1e67790bf101b2d65e0b38c8b0f3b8676d0129':
  do not use transactions for calls that just read the DB
2009-09-17 17:25:17 -07:00
Eric Fischer
26700acd09 am 45dfa63a: Merge change 25640 into eclair
Merge commit '45dfa63af3c279ed1ed456a30bea4bf8cca67f83' into eclair-plus-aosp

* commit '45dfa63af3c279ed1ed456a30bea4bf8cca67f83':
  Make the EditText error popup correctly resize when the view resizes.
2009-09-17 17:20:34 -07:00
Android (Google) Code Review
a70143db3a Merge change 25639 into eclair
* changes:
  do not use transactions for calls that just read the DB
2009-09-17 20:20:14 -04:00
Robert Greenwalt
6c48ff29fb am 1c7c3556: Merge change 25634 into eclair
Merge commit '1c7c355626ea870605beab6dc07d8ac7509a8b80' into eclair-plus-aosp

* commit '1c7c355626ea870605beab6dc07d8ac7509a8b80':
  Report NO_CONNECTIVITY when failover net unavail
2009-09-17 17:15:44 -07:00
Mike Lockwood
0adff79a62 am 409024e9: Merge change 25554 into eclair
Merge commit '409024e9c0f54e91c4898dc4ed7cd402f2c3d941' into eclair-plus-aosp

* commit '409024e9c0f54e91c4898dc4ed7cd402f2c3d941':
  telephony: Add CdmaCellLocation class to the public API.
2009-09-17 17:15:33 -07:00
Android (Google) Code Review
769cf0f279 Merge change 25640 into eclair
* changes:
  Make the EditText error popup correctly resize when the view resizes.
2009-09-17 20:14:37 -04:00