4846 Commits

Author SHA1 Message Date
Daisuke Miyakawa
182983ed00 am 4fce5c81: am 7c6770c2: Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which enables vCard composer to append "TYPE=" to type param/attribute everytime possible, which should fix the issue 2180800.
Merge commit '4fce5c81d5b166920c60d4a907e581c71c215858'

* commit '4fce5c81d5b166920c60d4a907e581c71c215858':
  Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which
2009-10-13 17:03:53 -07:00
Daisuke Miyakawa
53e6809271 am 74a2d09c: am 347daf3a: Merge change I2a52a60a into eclair-mr2
Merge commit '74a2d09cba89db3b404aa10d89b5139f5ff6ab5d'

* commit '74a2d09cba89db3b404aa10d89b5139f5ff6ab5d':
  Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
2009-10-13 17:02:58 -07:00
Mike Reed
3798dbb3f1 am 8547ce6a: am bd5662a1: Merge change Ifd71653f into eclair-mr2
Merge commit '8547ce6adaf218ea77c3062902f0cedf0347aa9c'

* commit '8547ce6adaf218ea77c3062902f0cedf0347aa9c':
  add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
2009-10-13 17:01:36 -07:00
Nick Pelly
85028842e4 am 132570cb: am 77df9d6e: am d301c904: Merge change I305c181c into eclair
Merge commit '132570cbf4715fa13d237f1255848caf0dbd9d79'

* commit '132570cbf4715fa13d237f1255848caf0dbd9d79':
  Delay 500ms between each registering each SDP record using sdptool.
2009-10-13 17:01:09 -07:00
Christoffer Gurell
d6dc568b6b am 78077455: am f555bf65: Merge change I4a4323c0 into eclair-mr2
Merge commit '78077455a89de6485f6d2223648e241ad7240ff6'

* commit '78077455a89de6485f6d2223648e241ad7240ff6':
  Fixes scroll/measure bug in EditText
2009-10-13 17:00:49 -07:00
Cary Clark
018c02edab am 13d5b998: am 3e88ddc5: Select plugin objects with focusCandidate
Merge commit '13d5b998c876e7f8b98b9e9c7440aa66cab1099d'

* commit '13d5b998c876e7f8b98b9e9c7440aa66cab1099d':
  Select plugin objects with focusCandidate
2009-10-13 16:59:39 -07:00
Jeff Hamilton
edd3d917af am a4b0c0d0: am 5d93de73: am 6dc3f4e5: Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit 'a4b0c0d00c80aa409ceb3f372cead2928fd4b601'

* commit 'a4b0c0d00c80aa409ceb3f372cead2928fd4b601':
  Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
2009-10-13 16:59:15 -07:00
Fred Quintana
ee4bc47afd am 0074e8f2: am a5e44bbd: am 083a50a3: Merge change I66693ea2 into eclair
Merge commit '0074e8f2e085cd84c40a6eb3dbf61dc29ed2cc8c'

* commit '0074e8f2e085cd84c40a6eb3dbf61dc29ed2cc8c':
  fix sync exponential backoff for expedited syncs
2009-10-13 16:59:05 -07:00
Jack Palevich
25022e0182 am cd0d9603: am 1bb55501: Merge change I85f598e0 into eclair-mr2
Merge commit 'cd0d9603c3e54b484ec5046538f336f57a3678bf'

* commit 'cd0d9603c3e54b484ec5046538f336f57a3678bf':
  Prevent transparent region from getting out of sync with Surface Flinger
2009-10-13 16:58:56 -07:00
Daisuke Miyakawa
27333ed424 am a9a42a67: am ca103c16: Merge change I6ce46417 into eclair-mr2
Merge commit 'a9a42a673f62a01fad6d7b82ba8c5f6493760c78'

* commit 'a9a42a673f62a01fad6d7b82ba8c5f6493760c78':
  Clean-up vCard code.
2009-10-13 16:53:00 -07:00
Grace Kloba
1cdbf0f210 am 947a9157: am 94ab3b6d: Expose WebViewClient of WebView.
Merge commit '947a915743c9ece5dfb7e39e585d9ff372e57244'

* commit '947a915743c9ece5dfb7e39e585d9ff372e57244':
  Expose WebViewClient of WebView.
2009-10-13 16:52:38 -07:00
Leon Scroggins
e4fc845754 am b3e3352f: am 70ca3c25: File upload.
Merge commit 'b3e3352fee7d2d81711f06c0bb37e91cb4db405a'

* commit 'b3e3352fee7d2d81711f06c0bb37e91cb4db405a':
  File upload.
2009-10-13 16:51:00 -07:00
Dan Egnor
7393bbff7f Framework-side DropBox service that maintains a size-bounded
queue of data chunks (sort of a blob-oriented logcat).

In the future, this will be coupled with a revised checkin service that
would actually upload this data.
2009-10-13 16:17:50 -07:00
David Krause
1215c57ed8 am a614b948: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit 'a614b948e18189adfe8e2553754db574ecb3fd7a'

* commit 'a614b948e18189adfe8e2553754db574ecb3fd7a':
  Make PhoneStateListeners not call TelephonyManager
  Setting WebCore cache limit depending on the memory class.
2009-10-13 14:27:04 -07:00
Jeff Sharkey
ef7739d453 am 6815a67c: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '6815a67c5322cbde7768330fd12882d955abdd2a'

* commit '6815a67c5322cbde7768330fd12882d955abdd2a':
  Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
2009-10-13 12:11:28 -07:00
Daisuke Miyakawa
463285bfa4 am a6a96cf4: am c93b88cf: Remove redundant comment. As of now, we cannot guarantee anything toward external developers.
Merge commit 'a6a96cf40e6e5349715ca6d2c81602d72d37da24'

* commit 'a6a96cf40e6e5349715ca6d2c81602d72d37da24':
  Remove redundant comment. As of now, we cannot guarantee anything toward external developers.
2009-10-13 12:11:11 -07:00
Daisuke Miyakawa
7a6ba0f442 am 258bc9cb: am 5a016488: Merge commit \'refs/changes/08/29008/8\' of ssh://dmiyakawa@android-git.corp.google.com:29418/platform/frameworks/base into cleanup_import
Merge commit '258bc9cb44f637d9ea1377d81a995bec2bd10a1d'

* commit '258bc9cb44f637d9ea1377d81a995bec2bd10a1d':
  Develop ContentResolver-based unit tests for vCard importer and fix vCard code
2009-10-13 12:11:01 -07:00
James Dong
ead92ef490 am 6195432b: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '6195432b6fde3cda4bc7e2406c8f2975795933a7'

* commit '6195432b6fde3cda4bc7e2406c8f2975795933a7':
  Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
  Fix issue #2176944: Need API so browser, others can determine memory size of device
  Fix issue #2177262: Improve animations
  Fix issue #2174566: HOT STABILITY: NPE in activity manager
2009-10-13 12:10:02 -07:00
Nick Pelly
b1fd1e1ff0 am eb772880: am 59778b3c: am db7ae10d: (-s ours) Remove STOPSHIP BT logging.
Merge commit 'eb772880e3e0ca472fc632af19543a8b17a03598'

* commit 'eb772880e3e0ca472fc632af19543a8b17a03598':
2009-10-13 12:06:50 -07:00
Eric Fischer
945ff20243 am 94f3a363: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '94f3a36326ddecaa09787d795451b0a229fe111c'

* commit '94f3a36326ddecaa09787d795451b0a229fe111c':
  Remove STOPSHIP BT logging.
  BT API security audit: fix a couple of permission mistakes.
  Fix issue #2175693: Add vmallocinfo to dumpstate
  add a way to easily catch and log GL errors (compile time flag)
  GPS: Fix problem with SUPL when SUPL APN is already active.
  Import revised translations.  DO NOT MERGE
  Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
  Import revised translations.  DO NOT MERGE
2009-10-13 12:04:49 -07:00
Brett Chabot
8a17c1e7c9 am 0221ec55: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '0221ec55ac57f32a42fb1e7b66779ca955d58558'

* commit '0221ec55ac57f32a42fb1e7b66779ca955d58558':
  Control H icon display in Status bar.
  Fixes #2175599. Prevents an NPE when AttachInfo is null.
  Set the Bond State to NONE when we receive a Agent Cancel.
  Make vCard import Photo from vCard file :(
2009-10-13 11:58:31 -07:00
Tadashi G. Takaoka
5f34bf1be3 am 7c270311: am 50b11ec6: Merge change I4d828c3a into eclair-mr2
Merge commit '7c270311f7167080112494c3095c984b1a141074'

* commit '7c270311f7167080112494c3095c984b1a141074':
  QuickContactBadge: Make lookup key query asynchronous.
2009-10-13 11:58:00 -07:00
Marc Blank
80010ff5ee am 3c5600ec: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '3c5600ecccd38d8fb6d39330f31fe91b5f99481b'

* commit '3c5600ecccd38d8fb6d39330f31fe91b5f99481b':
  dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
  Only dismiss search dialog after launching intent.
2009-10-13 11:54:04 -07:00
Xia Wang
787a016d3c am ec61707d: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit 'ec61707d39c14950f53795b0610ea1ee00daecdb'

* commit 'ec61707d39c14950f53795b0610ea1ee00daecdb':
  fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug 2171204
2009-10-13 11:52:42 -07:00
Dianne Hackborn
2e4258a4a1 am c7ed01f4: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit 'c7ed01f4011e688af59f91b613e48203690c394d'

* commit 'c7ed01f4011e688af59f91b613e48203690c394d':
  More fix #2163209: alarm clock rings but is hidden behind lock screen
2009-10-13 11:51:58 -07:00
Daisuke Miyakawa
4fce5c81d5 am 7c6770c2: Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which enables vCard composer to append "TYPE=" to type param/attribute everytime possible, which should fix the issue 2180800.
Merge commit '7c6770c26ba819bcad3d9522e046f9d1fdf9e222' into eclair-mr2-plus-aosp

* commit '7c6770c26ba819bcad3d9522e046f9d1fdf9e222':
  Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which
2009-10-12 15:58:32 -07:00
Daisuke Miyakawa
7c6770c26b Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which
enables vCard composer to append "TYPE=" to type param/attribute
everytime possible, which should fix the issue 2180800.

issue number: 2180800
2009-10-12 15:14:09 -07:00
Daisuke Miyakawa
74a2d09cba am 347daf3a: Merge change I2a52a60a into eclair-mr2
Merge commit '347daf3a9802b2a4184ff8aa90b4af6c5de79ab7' into eclair-mr2-plus-aosp

* commit '347daf3a9802b2a4184ff8aa90b4af6c5de79ab7':
  Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
2009-10-12 14:12:17 -07:00
Android (Google) Code Review
347daf3a98 Merge change I2a52a60a into eclair-mr2
* changes:
  Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
2009-10-12 17:03:12 -04:00
Daisuke Miyakawa
ba2b21bee8 Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
In order to share the logic between tests for importer and those for exporter,
PropertyNodesVerifier is now a separated class and drastically modified.
Now the class accept "unordered" expected PropertyNode objects, which allows vCard
composer to not care the exact order of each elements.

MockCursor is added, which may be added into the public API in the future, but in
the test directory for now.
Another MockContentProvider is (temporarily) developed so that it can be accepted by
MockContentResolver#addProvider(), which does not allow IContentProvider and its
descendants but only exact ContentProvider, while the original MockContentProvider in
android.test.mock.MockContentProvider implements IContentProvider.

The test development is still on-going, but this test suffices minimal requirement of
vCard tests.

Internal issue number: 2160039
2009-10-12 13:42:42 -07:00
Grace Kloba
2e081efc61 am 6764f2ca: am a921bf4e: Merge change I8f5e405f into eclair-mr2
Merge commit '6764f2ca442cbe906901af5296048f284adb1f7c'

* commit '6764f2ca442cbe906901af5296048f284adb1f7c':
  mGeolocationDatabasePath needs to compare mGeolocationDatabasePath
2009-10-12 12:42:01 -07:00
Dianne Hackborn
b493a1608e am fb256574: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit 'fb256574b4b5b5237ddda0efcf876b8eb436c961'

* commit 'fb256574b4b5b5237ddda0efcf876b8eb436c961':
  Fix issue #2171460: Turn off background blurring of power dialog
2009-10-12 12:41:42 -07:00
Nick Pelly
dffcd85541 am b2ad0f18: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit 'b2ad0f18bc030535687aed67f5c3a3139045dd84'

* commit 'b2ad0f18bc030535687aed67f5c3a3139045dd84':
  Introduce BluetoothAdapter.getDefaultAdapter().
2009-10-12 12:38:48 -07:00
David 'Digit' Turner
de553351bf am 4c220bd0: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '4c220bd0f32b93314c4c1bff328bd815265ef117'

* commit '4c220bd0f32b93314c4c1bff328bd815265ef117':
  Encourage developers to connect RFCOMM by UUID instead of Channel.
2009-10-12 12:36:03 -07:00
Romain Guy
a0b663bbc7 am ff9c48b3: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit 'ff9c48b3040833c7b3f85bcac116ba5f0dd247d0'

* commit 'ff9c48b3040833c7b3f85bcac116ba5f0dd247d0':
  Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
2009-10-12 12:35:06 -07:00
Amith Yamasani
92f72ec1bc am 360fde8e: am 446aeb1c: Merge change Ia98129b9 into eclair-mr2
Merge commit '360fde8eabdc9c45d1b52e350ccfb4bac9d93107'

* commit '360fde8eabdc9c45d1b52e350ccfb4bac9d93107':
  Fix preference caching to increase recycling of preference views.
2009-10-12 12:32:39 -07:00
Dianne Hackborn
755d3cf20c am c4f52bd7: am 7e5c5d97: am 0c3154d3: Fix issue #2163654: deadlock, runtime restart
Merge commit 'c4f52bd7550f57b1d483091a71871653d8928901'

* commit 'c4f52bd7550f57b1d483091a71871653d8928901':
  Fix issue #2163654: deadlock, runtime restart
2009-10-12 12:31:56 -07:00
Cary Clark
56f726cbb6 am fface18d: am 5da9aeb4: reset webTextView size if focus bounds changes
Merge commit 'fface18d254900cff57623c364f47d929b4089f6'

* commit 'fface18d254900cff57623c364f47d929b4089f6':
  reset webTextView size if focus bounds changes
2009-10-12 12:29:36 -07:00
Bjorn Bringert
e3b90ecd3f am ef8e6b56: am 19400067: am 4625758d: Merge change I2c5f1e76 into eclair
Merge commit 'ef8e6b5672c91baab09d5699b5a3ca0cb33ced6b'

* commit 'ef8e6b5672c91baab09d5699b5a3ca0cb33ced6b':
  Fix back button handling in ACTV
2009-10-12 12:28:50 -07:00
Fred Quintana
a1933d7dfc am 7fc5e5ab: am f9f7718f: am f038004f: changes from Sync Manager API Review: bug 2164262
Merge commit '7fc5e5ab6d404d13136d30b724975798717f57f0'

* commit '7fc5e5ab6d404d13136d30b724975798717f57f0':
  changes from Sync Manager API Review: bug 2164262
2009-10-12 12:28:37 -07:00
Mike Reed
8547ce6ada am bd5662a1: Merge change Ifd71653f into eclair-mr2
Merge commit 'bd5662a1a2e74f1be1e0a0fb4858835caf10c315' into eclair-mr2-plus-aosp

* commit 'bd5662a1a2e74f1be1e0a0fb4858835caf10c315':
  add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
2009-10-12 12:00:46 -07:00
Android (Google) Code Review
bd5662a1a2 Merge change Ifd71653f into eclair-mr2
* changes:
  add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
2009-10-12 14:52:45 -04:00
Ray Chen
9b98e49f62 am 2f2634e5: am 13ed5750: Add group id to getThumbnail and cancelThumbnailRequest API.
Merge commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc'

* commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc':
  Add group id to getThumbnail and cancelThumbnailRequest API.
2009-10-12 11:48:10 -07:00
Robert Greenwalt
0de99ced5b am 2a9b411d: am e8830120: am 92b5caa4: Merge change Id8df149c into eclair
Merge commit '2a9b411d4ed60acbe089068c93850ecd049f57f2'

* commit '2a9b411d4ed60acbe089068c93850ecd049f57f2':
  Turn some logging back on in ConnectionManager
2009-10-12 11:46:54 -07:00
Jim Miller
1c862c2978 am e15dc6e1: am ca4efac9: am f65161f1: Merge change If933b13d into eclair
Merge commit 'e15dc6e19f944889a8d9f3fb97b014aa7d298de9'

* commit 'e15dc6e19f944889a8d9f3fb97b014aa7d298de9':
  Fix for 2161835: Tweaks to rotary lock screen:
2009-10-12 11:44:59 -07:00
Wu-cheng Li
83a880065f am 3616d154: am 80fff7a5: am 962f2536: Merge change I547cff66 into eclair
Merge commit '3616d15451734bd3b563d73f9c2f25c19d7df75c'

* commit '3616d15451734bd3b563d73f9c2f25c19d7df75c':
  Add zoom functions and sendCommand.
2009-10-12 11:44:39 -07:00
Fred Quintana
d0b6760f37 am 7a5262a6: am 72fc14e8: am f83d9b3f: fix build breakage
Merge commit '7a5262a620819e85cdcc6441bf0eb0b05dafe46b'

* commit '7a5262a620819e85cdcc6441bf0eb0b05dafe46b':
  fix build breakage
2009-10-12 11:44:28 -07:00
Fred Quintana
e932cf997e am 11aaaa70: am 77a7bdce: am 5bba632d: - hide Entity and all its references - remove updateEntity and insertEntity, since they are not used - add the RawContacts.Entity class, which is used in lieu of the android.content.Entity
Merge commit '11aaaa70b75aa919b385289c5b06bbd20f9e424d'

* commit '11aaaa70b75aa919b385289c5b06bbd20f9e424d':
  - hide Entity and all its references
2009-10-12 11:44:16 -07:00
Suchi Amalapurapu
e5441dd9e7 am 5a535026: am ef3c63ad: am 5163cd6d: Merge change I5be3d603 into eclair
Merge commit '5a535026bfc1d091c0d029b21cc63f929c2def0a'

* commit '5a535026bfc1d091c0d029b21cc63f929c2def0a':
  Make sdk version and code names static finals in PackageParser.
2009-10-12 11:44:05 -07:00
Mike Reed
fd71653f6a add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs 2009-10-12 14:42:56 -04:00