5904 Commits

Author SHA1 Message Date
Dmitri Plotnikov
101dbb3e07 am e020ff61: am 0a299af2: am fe4c8715: Making new Contacts APIs visible in Eclair SDK - Part II
Merge commit 'e020ff61750d8b1e9a4d8880391472598af173e3'

* commit 'e020ff61750d8b1e9a4d8880391472598af173e3':
  Making new Contacts APIs visible in Eclair SDK - Part II
2009-10-14 07:56:55 -07:00
Dmitri Plotnikov
e020ff6175 am 0a299af2: am fe4c8715: Making new Contacts APIs visible in Eclair SDK - Part II
Merge commit '0a299af21fda41aac8126ff40808ff82135eaf9c' into eclair-mr2-plus-aosp

* commit '0a299af21fda41aac8126ff40808ff82135eaf9c':
  Making new Contacts APIs visible in Eclair SDK - Part II
2009-10-14 07:47:18 -07:00
Dmitri Plotnikov
0a299af21f am fe4c8715: Making new Contacts APIs visible in Eclair SDK - Part II
Merge commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6' into eclair-mr2

* commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6':
  Making new Contacts APIs visible in Eclair SDK - Part II
2009-10-14 07:38:11 -07:00
Mike Reed
addf1dfa31 am 5ed7b1e9: am 398c24ec: Merge change I4c64bb78 into eclair-mr2
Merge commit '5ed7b1e95e221d33b241bad86b8b1ef8e1549689'

* commit '5ed7b1e95e221d33b241bad86b8b1ef8e1549689':
  add hidden method to draw entire page into a canvas, with no view-chrome. For testing.
2009-10-14 07:19:32 -07:00
Mike Reed
5ed7b1e95e am 398c24ec: Merge change I4c64bb78 into eclair-mr2
Merge commit '398c24ecb50cafcce19f105f788fc311a430a8ff' into eclair-mr2-plus-aosp

* commit '398c24ecb50cafcce19f105f788fc311a430a8ff':
  add hidden method to draw entire page into a canvas, with no view-chrome. For testing.
2009-10-14 07:10:17 -07:00
Android (Google) Code Review
398c24ecb5 Merge change I4c64bb78 into eclair-mr2
* changes:
  add hidden method to draw entire page into a canvas, with no view-chrome. For testing.
2009-10-14 10:02:11 -04:00
Mike Reed
efe2c72a6d add hidden method to draw entire page into a canvas, with no view-chrome. For testing.
http://b/issue?id=2176120
2009-10-14 09:57:14 -04:00
Dmitri Plotnikov
fe4c8715c0 Making new Contacts APIs visible in Eclair SDK - Part II
Bug: http://b/2186595
Change-Id: Id87533c25cceb0fe3b0845aed10912c937679f45
2009-10-14 00:28:53 -07:00
Dmitri Plotnikov
8f26c13e59 am 767741ff: am 0741c134: am 6e144ad8: Making new Contacts APIs visible in Eclair SDK
Merge commit '767741ffd5d14471b88791e5db93c08e8d2571eb'

* commit '767741ffd5d14471b88791e5db93c08e8d2571eb':
  Making new Contacts APIs visible in Eclair SDK
2009-10-13 20:10:00 -07:00
Dmitri Plotnikov
767741ffd5 am 0741c134: am 6e144ad8: Making new Contacts APIs visible in Eclair SDK
Merge commit '0741c134645300fed9ad13760273c8d245a04e63' into eclair-mr2-plus-aosp

* commit '0741c134645300fed9ad13760273c8d245a04e63':
  Making new Contacts APIs visible in Eclair SDK
2009-10-13 20:00:44 -07:00
Dmitri Plotnikov
0741c13464 am 6e144ad8: Making new Contacts APIs visible in Eclair SDK
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-mr2

* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
  Making new Contacts APIs visible in Eclair SDK
2009-10-13 18:47:40 -07:00
Dmitri Plotnikov
6e144ad885 Making new Contacts APIs visible in Eclair SDK
Bug: http://b/2186595
 
Change-Id: Iaba8514276299504af6ab0714577eb37d9608237
2009-10-13 18:24:08 -07:00
Jeff Sharkey
4ec6378566 am a788f098: am 7d776dbb: am a78a9d4c: Correct non-opaque list separator assets.
Merge commit 'a788f09894f5b2113230a9ced9105fd6ad4c9a52'

* commit 'a788f09894f5b2113230a9ced9105fd6ad4c9a52':
  Correct non-opaque list separator assets.
2009-10-13 18:20:20 -07:00
Jeff Sharkey
a788f09894 am 7d776dbb: am a78a9d4c: Correct non-opaque list separator assets.
Merge commit '7d776dbbc567e592f5e5ae5f2e24053cdce78f31' into eclair-mr2-plus-aosp

* commit '7d776dbbc567e592f5e5ae5f2e24053cdce78f31':
  Correct non-opaque list separator assets.
2009-10-13 18:14:44 -07:00
Dan Egnor
eac70503c2 am 5c8a80b8: Merge change I4410ec8f into eclair-mr2
Merge commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625' into eclair-mr2-plus-aosp

* commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625':
  Framework-side DropBox service that maintains a size-bounded
2009-10-13 18:14:37 -07:00
Jeff Sharkey
7d776dbbc5 am a78a9d4c: Correct non-opaque list separator assets.
Merge commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0' into eclair-mr2

* commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0':
  Correct non-opaque list separator assets.
2009-10-13 18:05:48 -07:00
Android (Google) Code Review
5c8a80b8fc Merge change I4410ec8f into eclair-mr2
* changes:
  Framework-side DropBox service that maintains a size-bounded queue of data chunks (sort of a blob-oriented logcat).
2009-10-13 21:01:26 -04:00
Dan Egnor
4410ec8f7c 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 17:36:19 -07:00
Doug Zongker
33ce433ac2 am a973eaea: am b5b67779: Merge change I7fa8c508 into eclair-mr2
Merge commit 'a973eaea4597d819671c5caab8feed442e9a1af5'

* commit 'a973eaea4597d819671c5caab8feed442e9a1af5':
  make erase-password-on-SIM-change optional
2009-10-13 17:11:12 -07:00
Ken Shirriff
d8f81c3bb7 am 947c45b2: am b10036b3: Merge change Iaa321588 into eclair-mr2
Merge commit '947c45b29586b64c358b7824881d98faa8733ba8'

* commit '947c45b29586b64c358b7824881d98faa8733ba8':
  Add "deleted" row to Events table.
2009-10-13 17:09:44 -07:00
Leon Scroggins
1837bfe8ad am 7fd752af: am 5a4f64fc: Merge change Id5ba82a1 into eclair-mr2
Merge commit '7fd752af7507e9f3d3e28f8e646f53f16373c02d'

* commit '7fd752af7507e9f3d3e28f8e646f53f16373c02d':
  Prevent getFile from copying when the file is too large.
2009-10-13 17:09:07 -07:00
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