Commit Graph

5306 Commits

Author SHA1 Message Date
Android (Google) Code Review
920afe8191 Merge change 25628 into eclair
* changes:
  Inefficient but correct fix for 2122381: call finishBackup after every performBackup
2009-09-18 18:25:33 -04:00
Dmitri Plotnikov
c6f99af7a6 am b18b0956: Merge change 25829 into eclair
Merge commit 'b18b0956afbe0730ced1c5b95c0071dba447765e' into eclair-plus-aosp

* commit 'b18b0956afbe0730ced1c5b95c0071dba447765e':
  Revert "ContactsContract: Adding joined columns to the Data class definition."
2009-09-18 15:13:59 -07:00
Android (Google) Code Review
d1311cdf31 Merge change 25829 into eclair
* changes:
  Revert "ContactsContract: Adding joined columns to the Data class definition."
2009-09-18 18:05:50 -04:00
Jason Sams
672b18c3a1 am a411bf01: Merge change 25818 into eclair
Merge commit 'a411bf01fc8c581651af19556cc9e4bf7aca8da2' into eclair-plus-aosp

* commit 'a411bf01fc8c581651af19556cc9e4bf7aca8da2':
  Clean up some debugging and add 2 math lib routines.
2009-09-18 14:33:17 -07:00
Android (Google) Code Review
cc9deeb031 Merge change 25818 into eclair
* changes:
  Clean up some debugging and add 2 math lib routines.
2009-09-18 17:25:21 -04:00
Libin Tang
a2739a9c34 am 6286f311: Merge change 25810 into eclair
Merge commit '6286f311c3b80ee6b4b1985a290a889f895203f9' into eclair-plus-aosp

* commit '6286f311c3b80ee6b4b1985a290a889f895203f9':
  Fix pause-wait dial string conversion error
2009-09-18 14:08:12 -07:00
Android (Google) Code Review
658ba87e29 Merge change 25810 into eclair
* changes:
  Fix pause-wait dial string conversion error
2009-09-18 17:02:56 -04:00
Dmitri Plotnikov
e7a6e318f8 am 6a154178: Merge change 25800 into eclair
Merge commit '6a15417849afab889f1f0cd79e655eaac6b45dca' into eclair-plus-aosp

* commit '6a15417849afab889f1f0cd79e655eaac6b45dca':
  ContactsContract: Adding joined columns to the Data class definition.
2009-09-18 14:00:03 -07:00
Nick Pelly
896b3ee6f8 am d7638e6d: Merge change 25780 into eclair
Merge commit 'd7638e6de29d475623ac7f05a6fa92e92362be22' into eclair-plus-aosp

* commit 'd7638e6de29d475623ac7f05a6fa92e92362be22':
  Reject lowercase characters in checkBluetoothAddress().
2009-09-18 13:59:55 -07:00
Evan Millar
8e572c6c9c am 2c22a510: More hi-res assets, and darken background color to donut level.
Merge commit '2c22a51072fd71e3a50df9c26f9078bd62c90cd3' into eclair-plus-aosp

* commit '2c22a51072fd71e3a50df9c26f9078bd62c90cd3':
  More hi-res assets, and darken background color to donut level.
2009-09-18 13:59:46 -07:00
Daniel Sandler
bdda3f1db1 am e5a6d16f: Merge change 25785 into eclair
Merge commit 'e5a6d16f26543061a0fc815ba90644a44995e025' into eclair-plus-aosp

* commit 'e5a6d16f26543061a0fc815ba90644a44995e025':
  Fix http://b/2126318 (density test fails due to wrong-size asset stripping)
2009-09-18 13:59:38 -07:00
Android (Google) Code Review
57bee39221 Merge change 25800 into eclair
* changes:
  ContactsContract: Adding joined columns to the Data class definition.
2009-09-18 16:54:34 -04:00
Android (Google) Code Review
d1378a12f6 Merge change 25780 into eclair
* changes:
  Reject lowercase characters in checkBluetoothAddress().
2009-09-18 16:51:36 -04:00
Android (Google) Code Review
13026403db Merge change 25785 into eclair
* changes:
  Fix http://b/2126318 (density test fails due to wrong-size asset stripping)
2009-09-18 15:23:40 -04:00
Daniel Sandler
f590322bf5 am 3f90aae6: Merge change 25786 into eclair
Merge commit '3f90aae6184bf0713ad684fcea3c4836479b9de4' into eclair-plus-aosp

* commit '3f90aae6184bf0713ad684fcea3c4836479b9de4':
  Fix http://b/2086471 (list view headers too dark in mdpi).
2009-09-18 12:23:39 -07:00
Android (Google) Code Review
fe9acfe42d Merge change 25786 into eclair
* changes:
  Fix http://b/2086471 (list view headers too dark in mdpi).
2009-09-18 15:18:27 -04:00
Jacek Surazski
1f1652565b am c3a3b399: Merge change 25752 into eclair
Merge commit 'c3a3b399a9d7707b7f3c4108e0e31a1b664a6f22' into eclair-plus-aosp

* commit 'c3a3b399a9d7707b7f3c4108e0e31a1b664a6f22':
  Add a Gservices setting to controll the app error reporting feature.
2009-09-18 12:13:35 -07:00
Android (Google) Code Review
e40f007042 Merge change 25752 into eclair
* changes:
  Add a Gservices setting to controll the app error reporting feature.
2009-09-18 15:07:28 -04:00
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
Chia-chi Yeh
2f3b2a5aa6 keystore: switch to multi-user version. 2009-09-18 17:23:53 +08: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