Commit Graph

21725 Commits

Author SHA1 Message Date
Chung-yih Wang
0b554f784a am 4a04a312: am bd229420: Fix the unhold issue especially if one is behind NAT.
Merge commit '4a04a3129bd30a996dd302b982aeca8f228f57e8'

* commit '4a04a3129bd30a996dd302b982aeca8f228f57e8':
  Fix the unhold issue especially if one is behind NAT.
2010-09-27 09:07:43 -07:00
Chung-yih Wang
afc0169dd7 am bd229420: Fix the unhold issue especially if one is behind NAT.
Merge commit 'bd2294204e3edaede3fe81eb9b11c05c4fafe627' into gingerbread-plus-aosp

* commit 'bd2294204e3edaede3fe81eb9b11c05c4fafe627':
  Fix the unhold issue especially if one is behind NAT.
2010-09-27 09:03:01 -07:00
Eric Laurent
1c9b5b8c44 am 1b37df95: am 9627847d: Merge "Fix error in AudioEffect command status reporting." into gingerbread
Merge commit '1b37df95ec9d03aaa5f4055c6cd86db42f9c9727'

* commit '1b37df95ec9d03aaa5f4055c6cd86db42f9c9727':
  Fix error in AudioEffect command status reporting.
2010-09-27 08:48:40 -07:00
Eric Laurent
4ad2e655e7 am 9627847d: Merge "Fix error in AudioEffect command status reporting." into gingerbread
Merge commit '9627847d588cd969f60dcc79d165209184a90069' into gingerbread-plus-aosp

* commit '9627847d588cd969f60dcc79d165209184a90069':
  Fix error in AudioEffect command status reporting.
2010-09-27 08:45:07 -07:00
Eric Laurent
61d5a7f8e4 Merge "Fix error in AudioEffect command status reporting." into gingerbread 2010-09-27 08:41:00 -07:00
Kenny Root
178a33f57c am 8f767774: am 465618ed: Merge "Use buffered output during packages.xml write" into gingerbread
Merge commit '8f767774230cba9b5cfc298f2e24972a79cd0182'

* commit '8f767774230cba9b5cfc298f2e24972a79cd0182':
  Use buffered output during packages.xml write
2010-09-27 08:28:07 -07:00
Kenny Root
1ed42d265a am 465618ed: Merge "Use buffered output during packages.xml write" into gingerbread
Merge commit '465618ed567c418442890fcf91b6ee361b22b88b' into gingerbread-plus-aosp

* commit '465618ed567c418442890fcf91b6ee361b22b88b':
  Use buffered output during packages.xml write
2010-09-27 08:15:57 -07:00
Kenny Root
ca5eb60743 Merge "Use buffered output during packages.xml write" into gingerbread 2010-09-27 08:03:47 -07:00
Fabrice Di Meglio
1f0f0da94b am 514a455f: am 28fa220c: Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread
Merge commit '514a455f2a63d6b3366b848a585d99e8680f69aa'

* commit '514a455f2a63d6b3366b848a585d99e8680f69aa':
  Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)
2010-09-27 02:36:40 -07:00
Fabrice Di Meglio
ee239b4042 am 28fa220c: Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread
Merge commit '28fa220c8da1ea2933ac96595516d1efa545c1ea' into gingerbread-plus-aosp

* commit '28fa220c8da1ea2933ac96595516d1efa545c1ea':
  Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)
2010-09-27 02:27:08 -07:00
Fabrice Di Meglio
1b0fe7a6dc Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread 2010-09-27 02:16:01 -07:00
Mathias Agopian
46b2e52656 Merge "new screencap command" 2010-09-26 19:12:39 -07:00
Joe Onorato
6b750d24b8 Merge "Implement disable() on the status bar." 2010-09-26 19:09:12 -07:00
Mindy Pereira
443e4bc646 am 560ba6e1: (-s ours) am 08c09b0f: Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread
Merge commit '560ba6e1a9dbd8a57fdee2040185981162ed09d6'

* commit '560ba6e1a9dbd8a57fdee2040185981162ed09d6':
  DO NOT MERGE. Only 1 edge glow should be growing at a time.
2010-09-26 18:45:48 -07:00
Romain Guy
066a9f154d Merge "Adding display lists to the GL renderer (checkpoint.)" 2010-09-26 18:42:04 -07:00
Mindy Pereira
7981a338fa am 08c09b0f: Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread
Merge commit '08c09b0f84b23627b4cd02e1b9a642952fbd2e7f' into gingerbread-plus-aosp

* commit '08c09b0f84b23627b4cd02e1b9a642952fbd2e7f':
  DO NOT MERGE. Only 1 edge glow should be growing at a time.
2010-09-26 18:37:04 -07:00
Mindy Pereira
70da97b0dd Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread 2010-09-26 18:16:26 -07:00
Jean-Baptiste Queru
339f8e9f94 am dafad06e: (-s ours) am 9035e206: reconcile froyo-release into gingerbread
Merge commit 'dafad06e7fba5ea3dea43aebe16d5a34c34af426'

* commit 'dafad06e7fba5ea3dea43aebe16d5a34c34af426':
  Add an option to hide the Voice Search icon.
  Add BT test instrumentation for reboot tests.
  DO NOT MERGE Separate utility methods into utility class.
  Improve logging and flexibility of BT stress tests.
  Remove @LargeTest annotations
  Checkin initial bluetooth stress tests.
  Change CDMAPhone.getDeviceId to return MEID or ESN.
  Make the default backup configuration "disabled; local transport selected"
  make android_id random seed depend on time as well as ro.serialno
  Continue trying to make the turn off quickly after call feature work.
2010-09-26 17:57:16 -07:00
Jean-Baptiste Queru
660026ccac am 9035e206: reconcile froyo-release into gingerbread
Merge commit '9035e206b3700928bc268b7c1ece34506e0a4f28' into gingerbread-plus-aosp

* commit '9035e206b3700928bc268b7c1ece34506e0a4f28':
  Add an option to hide the Voice Search icon.
  Add BT test instrumentation for reboot tests.
  DO NOT MERGE Separate utility methods into utility class.
  Improve logging and flexibility of BT stress tests.
  Remove @LargeTest annotations
  Checkin initial bluetooth stress tests.
  Change CDMAPhone.getDeviceId to return MEID or ESN.
  Make the default backup configuration "disabled; local transport selected"
  make android_id random seed depend on time as well as ro.serialno
  Continue trying to make the turn off quickly after call feature work.
2010-09-26 17:41:59 -07:00
Jean-Baptiste Queru
79f006b69f reconcile froyo-release into gingerbread
Change-Id: I4c6d47421ed7a26b65f4f2df105d8375fcc3d840
2010-09-26 17:29:28 -07:00
Joe Onorato
8dc49e9b04 Merge "Use the correct combination of flags to have the status bar panels not pass touch events." 2010-09-26 15:09:59 -07:00
Alex Sakhartchouk
2372946ad9 Merge "Adding timer to display renderscript jit duration." 2010-09-26 14:59:31 -07:00
Joe Onorato
88e229254c Merge "Touching the blue glow should close the system and notification panels." 2010-09-26 14:41:42 -07:00
Chris Palmer
fe480ac939 Merge "Clarify the explanation of Android's security design." 2010-09-26 14:17:32 -07:00
John Wang
8f1fe8bda2 am becc9148: am 8f5a1211: Merge "Add debug functions." into gingerbread
Merge commit 'becc9148e3698eeaf6ea854dabf2808490cd8f62'

* commit 'becc9148e3698eeaf6ea854dabf2808490cd8f62':
  Add debug functions.
2010-09-26 14:16:29 -07:00
Daisuke Miyakawa
9b2a2e94ca am b643cbe5: (-s ours) am e0998604: Add necessary logic removed during backport
Merge commit 'b643cbe55852b01f1ab81da76d841b58d890276a'

* commit 'b643cbe55852b01f1ab81da76d841b58d890276a':
  Add necessary logic removed during backport
2010-09-26 14:15:40 -07:00
John Wang
bcccf476b3 am 8f5a1211: Merge "Add debug functions." into gingerbread
Merge commit '8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e' into gingerbread-plus-aosp

* commit '8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e':
  Add debug functions.
2010-09-26 13:58:02 -07:00
John Wang
9110d71aa9 Merge "Add debug functions." into gingerbread 2010-09-26 13:53:33 -07:00
Amith Yamasani
ef5f3c2627 Merge "Make the headers pane disappear in no-headers mode, not just the ListView." 2010-09-26 13:51:59 -07:00
Chet Haase
70dbf98867 Merge "bug fixes in animation classes" 2010-09-26 13:51:30 -07:00
Daisuke Miyakawa
6ece5d4c89 am e0998604: Add necessary logic removed during backport
Merge commit 'e0998604df4ddfcd5c87ea097dcc0950a9518ed1' into gingerbread-plus-aosp

* commit 'e0998604df4ddfcd5c87ea097dcc0950a9518ed1':
  Add necessary logic removed during backport
2010-09-26 13:12:55 -07:00
Joe Onorato
5ef11d7251 Merge "Notification updates." 2010-09-26 13:05:15 -07:00
Mike Lockwood
1d089ca6cd Merge changes I1302cacd,I05125c79,I8d9653ce
* changes:
  MTP: Fix some warnings
  MTP: Include current property value in GetDevicePropDesc
  MTP: Fix reading and writing device property descriptors
2010-09-26 09:42:06 -07:00
Sonia Serafimova
f6ebbbab9e am f023c4dc: am d45a3355: Prevent unhandled exception in NinePatchDrawable
Merge commit 'f023c4dceb9cf112dd621b52b364211e2e549a06'

* commit 'f023c4dceb9cf112dd621b52b364211e2e549a06':
  Prevent unhandled exception in NinePatchDrawable
2010-09-26 09:36:10 -07:00
Sonia Serafimova
ad7ee60eb0 am d45a3355: Prevent unhandled exception in NinePatchDrawable
Merge commit 'd45a33554ca6c18ed81e45320998b9e4f4680379' into gingerbread-plus-aosp

* commit 'd45a33554ca6c18ed81e45320998b9e4f4680379':
  Prevent unhandled exception in NinePatchDrawable
2010-09-26 09:33:31 -07:00
Jean-Baptiste Queru
ecc33464d5 am ca3f968c: am 7d9c73fb: Merge "Prevent unhandled exception in NinePatchDrawable"
Merge commit 'ca3f968c6f0acbf94988d00bf21a82a2e8f49b86'

* commit 'ca3f968c6f0acbf94988d00bf21a82a2e8f49b86':
  Prevent unhandled exception in NinePatchDrawable
2010-09-26 08:44:16 -07:00
Jean-Baptiste Queru
0dd4e94da1 am 74a8df20: am dcfb271b: Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."
Merge commit '74a8df2026514025b186aba80a810a03377a80e9'

* commit '74a8df2026514025b186aba80a810a03377a80e9':
  Fix if ACTION_DOWN and lost focus time too close, it will become long press.
2010-09-26 08:44:07 -07:00
Jean-Baptiste Queru
31a23c9a6c am 7d9c73fb: Merge "Prevent unhandled exception in NinePatchDrawable"
Merge commit '7d9c73fb6f6f79f7f92b77482a0edbd7b89f2564' into gingerbread-plus-aosp

* commit '7d9c73fb6f6f79f7f92b77482a0edbd7b89f2564':
  Prevent unhandled exception in NinePatchDrawable
2010-09-26 08:39:03 -07:00
Jean-Baptiste Queru
a23edef35d am dcfb271b: Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."
Merge commit 'dcfb271b7fa364d567ffd7c495b2baa28a755251' into gingerbread-plus-aosp

* commit 'dcfb271b7fa364d567ffd7c495b2baa28a755251':
  Fix if ACTION_DOWN and lost focus time too close, it will become long press.
2010-09-26 08:38:59 -07:00
Jean-Baptiste Queru
c85a320c2b Merge "Prevent unhandled exception in NinePatchDrawable" 2010-09-26 08:22:15 -07:00
Jean-Baptiste Queru
04fba24b73 Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press." 2010-09-26 08:16:26 -07:00
Romain Guy
8e0f95aaec Merge "Add debug mode to measure performance." 2010-09-24 18:45:13 -07:00
Mathias Agopian
a3aefeb1c3 am 495ad4f2: am beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread
Merge commit '495ad4f22096aa172d025c16c25497e7dad8f2bd'

* commit '495ad4f22096aa172d025c16c25497e7dad8f2bd':
  simple test app for screen capture API
  add support for [1974164] Be able to take a screen shot on the device
2010-09-24 18:13:22 -07:00
Dianne Hackborn
086dd3377c am c388844d: (-s ours) am 234e42df: DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*
Merge commit 'c388844d50a67ecd8eb93d29d618bae1fa3a3c5d'

* commit 'c388844d50a67ecd8eb93d29d618bae1fa3a3c5d':
  DO NOT MERGE.  Fix issue #3000764: API REVIEW: android.R.*
2010-09-24 18:10:18 -07:00
Gil Dobjanschi
1cf11617d3 Merge "Adjust the duration of transitions if needed." 2010-09-24 18:08:02 -07:00
Mathias Agopian
c814f965de am beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread
Merge commit 'beabe75a842d521b005999460d3a6361ab32108e' into gingerbread-plus-aosp

* commit 'beabe75a842d521b005999460d3a6361ab32108e':
  simple test app for screen capture API
  add support for [1974164] Be able to take a screen shot on the device
2010-09-24 18:07:41 -07:00
Dianne Hackborn
afb309d573 am 234e42df: DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*
Merge commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a' into gingerbread-plus-aosp

* commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a':
  DO NOT MERGE.  Fix issue #3000764: API REVIEW: android.R.*
2010-09-24 18:05:14 -07:00
Mathias Agopian
8405dff685 Merge changes I1f7c4535,I741c68a2 into gingerbread
* changes:
  simple test app for screen capture API
  add support for [1974164] Be able to take a screen shot on the device
2010-09-24 18:02:10 -07:00
Patrick Dubroy
09c38adbda am a9cf4494: (-s ours) am 88aa072a: Merge "do not merge - Asset update (pass #3)" into gingerbread
Merge commit 'a9cf44942b8dbdc5bb00b80725ea15d176ebecc8'

* commit 'a9cf44942b8dbdc5bb00b80725ea15d176ebecc8':
  do not merge - Asset update (pass #3)
2010-09-24 17:14:43 -07:00
Winson Chung
9338c66b5c Merge "Re-architecting RemoteViewsAdapter internals due to new constraints." 2010-09-24 17:03:16 -07:00