6034 Commits

Author SHA1 Message Date
Eric Fischer
d3ee3b7e2b am bd6c80f6: Import revised translations. DO NOT MERGE
Merge commit 'bd6c80f689bc36523b935d84f9e5e563c2040f64' into eclair-mr2-plus-aosp

* commit 'bd6c80f689bc36523b935d84f9e5e563c2040f64':
  Import revised translations.  DO NOT MERGE
2009-10-13 17:09:00 -07:00
Derek Sollenberger
6ffcd512b4 am b4b5f2af: am 14592861: Merge change I3dafca18 into eclair-mr2
Merge commit 'b4b5f2af456acef83e69d4aa4b28b42a1859be7d'

* commit 'b4b5f2af456acef83e69d4aa4b28b42a1859be7d':
  Enabling plugin surfaces to update their position in the UI.
2009-10-13 17:08:40 -07:00
Dave Sparks
00454f979c am d6e86a68: am 7d4acc53: am 69e2ef47: Merge change I9f93ce61 into eclair
Merge commit 'd6e86a687d57851b90d025ae33a8e4021bffe10d'

* commit 'd6e86a687d57851b90d025ae33a8e4021bffe10d':
  Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 17:06:52 -07:00
Grace Kloba
850efa869c am 4d915e00: am d5ad08bd: am 2e778c17: Merge change I124356f6 into eclair
Merge commit '4d915e00dcf40143f9caf89fd8eeadd32a8cb6f4'

* commit '4d915e00dcf40143f9caf89fd8eeadd32a8cb6f4':
  Continue caching "POST" result so that we won't get
2009-10-13 17:05:30 -07:00
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
Patrick Scott
26e7c40cfa am 5a6d521d: am 656c037c: Fix the youtube placeholder.
Merge commit '5a6d521d9c348e35bb8b849d1fd5bea4db94a269'

* commit '5a6d521d9c348e35bb8b849d1fd5bea4db94a269':
  Fix the youtube placeholder.
2009-10-13 16:59: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
Zheng BaoZhong
416dd8e60a am 360f21cd: am a4adc798: Merge change I409d9b4a into eclair-mr2
Merge commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca'

* commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca':
  Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
2009-10-13 16:59:28 -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
Android (Google) Code Review
f3e022f9d5 Merge change I3f59d859
* changes:
  Reimport translations.
2009-10-13 19:50:02 -04:00
Eric Fischer
da1d0a679c Reimport translations.
Change-Id: I3f59d859605c2744a4a10d06139bc366cc21cf8e
2009-10-13 16:29:59 -07:00
Jeff Sharkey
a78a9d4c93 Correct non-opaque list separator assets.
Fixes http://b/2186076
2009-10-13 16:28:53 -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
Eric Fischer
bd6c80f689 Import revised translations. DO NOT MERGE 2009-10-13 16:03:48 -07:00
Doug Zongker
a973eaea45 am b5b67779: Merge change I7fa8c508 into eclair-mr2
Merge commit 'b5b6777903d85349cf4baa07a54e1629551ea712' into eclair-mr2-plus-aosp

* commit 'b5b6777903d85349cf4baa07a54e1629551ea712':
  make erase-password-on-SIM-change optional
2009-10-13 15:04:05 -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
Android (Google) Code Review
b5b6777903 Merge change I7fa8c508 into eclair-mr2
* changes:
  make erase-password-on-SIM-change optional
2009-10-13 17:26:48 -04:00
Ken Shirriff
947c45b295 am b10036b3: Merge change Iaa321588 into eclair-mr2
Merge commit 'b10036b39003b6961c57f87f65236c1d5d0d1e52' into eclair-mr2-plus-aosp

* commit 'b10036b39003b6961c57f87f65236c1d5d0d1e52':
  Add "deleted" row to Events table.
2009-10-13 13:15:35 -07:00
Android (Google) Code Review
b10036b390 Merge change Iaa321588 into eclair-mr2
* changes:
  Add "deleted" row to Events table.
2009-10-13 16:10:32 -04:00
Doug Zongker
7fa8c508e0 make erase-password-on-SIM-change optional
Make this "feature" controlled by a system property so it can be
enabled only for carriers that want it.
2009-10-13 13:02:49 -07:00
Grace Kloba
58def690a8 If openOrCreateDatabase() throws an exception, delete
the old db and re-do it. If it still fails, something
bad happens, like the directory may have the different
permission. Let it throw as WebView needs the db.

Fix http://b/issue?id=2179339
2009-10-13 12:57:08 -07:00
Leon Scroggins
7fd752af75 am 5a4f64fc: Merge change Id5ba82a1 into eclair-mr2
Merge commit '5a4f64fcbf0382f33e9f79e6d0497113b972690e' into eclair-mr2-plus-aosp

* commit '5a4f64fcbf0382f33e9f79e6d0497113b972690e':
  Prevent getFile from copying when the file is too large.
2009-10-13 12:17:53 -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
Android (Google) Code Review
5a4f64fcbf Merge change Id5ba82a1 into eclair-mr2
* changes:
  Prevent getFile from copying when the file is too large.
2009-10-13 15:09:18 -04: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
Derek Sollenberger
b4b5f2af45 am 14592861: Merge change I3dafca18 into eclair-mr2
Merge commit '145928617af865e867f6f27e99173d2a756b9dfd' into eclair-mr2-plus-aosp

* commit '145928617af865e867f6f27e99173d2a756b9dfd':
  Enabling plugin surfaces to update their position in the UI.
2009-10-13 11:47:49 -07:00
Android (Google) Code Review
145928617a Merge change I3dafca18 into eclair-mr2
* changes:
  Enabling plugin surfaces to update their position in the UI.
2009-10-13 14:39:37 -04:00
Leon Scroggins
d5ba82a1fe Prevent getFile from copying when the file is too large.
Since the caller expects the data to fit within a certain amount of
space, do not copy into the buffer if the data exceeds that space.

Requires a change to external/webkit
2009-10-13 14:23:56 -04:00
Dave Sparks
d6e86a687d am 7d4acc53: am 69e2ef47: Merge change I9f93ce61 into eclair
Merge commit '7d4acc5316c080d8e9787d2a7c84e2a2500b85f8' into eclair-mr2-plus-aosp

* commit '7d4acc5316c080d8e9787d2a7c84e2a2500b85f8':
  Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 10:03:33 -07:00
Dave Sparks
7d4acc5316 am 69e2ef47: Merge change I9f93ce61 into eclair
Merge commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42' into eclair-mr2

* commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42':
  Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 09:56:26 -07:00
Derek Sollenberger
3dafca1842 Enabling plugin surfaces to update their position in the UI. 2009-10-13 11:45:47 -04:00
Android (Google) Code Review
69e2ef473c Merge change I9f93ce61 into eclair
* changes:
  Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 06:02:59 -04:00