Commit Graph

5014 Commits

Author SHA1 Message Date
Mathias Agopian
d0d5a61917 am 7bf75f6d: Merge change 25207 into eclair
Merge commit '7bf75f6dc4b0b19df2b0365ba760da9dd8e1a4c3' into eclair-plus-aosp

* commit '7bf75f6dc4b0b19df2b0365ba760da9dd8e1a4c3':
  fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
2009-09-15 19:35:13 -07:00
Android (Google) Code Review
f2f2787391 Merge change 25206 into eclair
* changes:
  Make vCard importer code use Account information if possible.
2009-09-15 22:33:06 -04:00
Android (Google) Code Review
26b85360cc Merge change 25212 into eclair
* changes:
  revert to black video background, since we don't need the color-key anylonger
2009-09-15 22:32:37 -04:00
Mathias Agopian
b8cfc0f9e1 revert to black video background, since we don't need the color-key anylonger 2009-09-15 19:31:28 -07:00
Android (Google) Code Review
f86558451e Merge change 25207 into eclair
* changes:
  fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
2009-09-15 22:26:26 -04:00
Mathias Agopian
68a6afeb26 fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
Take 2. We needed to check that the usage flags are "good enough" as opposed to "the same".

This reverts commit 8f17a762fe9e9f31e4e86cb60ff2bfb6b10fdee6.
2009-09-15 19:21:31 -07:00
Karl Rosaen
4af01a8b39 am c6587dc8: Merge change 25178 into eclair
Merge commit 'c6587dc870d06e4d5022705d08464fc7abb1c5f8' into eclair-plus-aosp

* commit 'c6587dc870d06e4d5022705d08464fc7abb1c5f8':
  Add RotarySelector widget to android.internal for use by lock screen and incoming call screen.
2009-09-15 19:16:57 -07:00
Nicolas Catania
c9009dd035 am d9e28017: Merge change 25092 into eclair
Merge commit 'd9e28017f6e3da3a176d11fd0c722b1d7811d27b' into eclair-plus-aosp

* commit 'd9e28017f6e3da3a176d11fd0c722b1d7811d27b':
  New field in CallerInfo to cache if the call is an emergency one.
2009-09-15 19:16:51 -07:00
Android (Google) Code Review
1c90feaee1 Merge change 25178 into eclair
* changes:
  Add RotarySelector widget to android.internal for use by lock screen and incoming call screen.
2009-09-15 22:12:58 -04:00
Dianne Hackborn
3059711cda am 6ee7b04d: Merge change 25192 into eclair
Merge commit '6ee7b04d270824214fca0296d0386e0c3d733cdf' into eclair-plus-aosp

* commit '6ee7b04d270824214fca0296d0386e0c3d733cdf':
  Some improvements for wallpaper configuration.
2009-09-15 19:12:08 -07:00
Android (Google) Code Review
0b5b2f970b Merge change 25092 into eclair
* changes:
  New field in CallerInfo to cache if the call is an emergency one.
2009-09-15 22:11:57 -04:00
Android (Google) Code Review
54a17ad821 Merge change 25192 into eclair
* changes:
  Some improvements for wallpaper configuration.
2009-09-15 22:06:24 -04:00
Mathias Agopian
c9b1c7ebc8 am dd8f6186: Merge change 25201 into eclair
Merge commit 'dd8f6186775f69a8fef6213bcdc23be633d1ab6f' into eclair-plus-aosp

* commit 'dd8f6186775f69a8fef6213bcdc23be633d1ab6f':
  Revert "fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer"
2009-09-15 19:02:24 -07:00
Mathias Agopian
25e8e67fa8 am 49071af7: Merge change 25188 into eclair
Merge commit '49071af7bd19491f21f23a59621227ef48c11146' into eclair-plus-aosp

* commit '49071af7bd19491f21f23a59621227ef48c11146':
  make the window-shade use an opaque surface if possible
2009-09-15 19:02:17 -07:00
Android (Google) Code Review
70cc9e16be Merge change 25201 into eclair
* changes:
  Revert "fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer"
2009-09-15 21:57:44 -04:00
Mathias Agopian
3910f5467a Revert "fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer"
This reverts commit 486aa963b63e20b7910e1004cebb4f0afabbd80f.
2009-09-15 18:57:06 -07:00
Android (Google) Code Review
8395d598e2 Merge change 25188 into eclair
* changes:
  make the window-shade use an opaque surface if possible
2009-09-15 21:56:44 -04:00
Derek Sollenberger
24be1d4841 am 5862b673: Merge change 25187 into eclair
Merge commit '5862b673d412e596f3fa419c00bd0ba16bf6c094' into eclair-plus-aosp

* commit '5862b673d412e596f3fa419c00bd0ba16bf6c094':
  fixing documentation for PluginStub
2009-09-15 18:32:01 -07:00
Android (Google) Code Review
3a74bd6779 Merge change 25187 into eclair
* changes:
  fixing documentation for PluginStub
2009-09-15 21:23:42 -04:00
Jim Miller
d7583f7275 am 7c3e493d: Merge change 25177 into eclair
Merge commit '7c3e493d7b2db7f28d6fdb52d79c4d99ef1502b8' into eclair-plus-aosp

* commit '7c3e493d7b2db7f28d6fdb52d79c4d99ef1502b8':
  Fix for #2092883: Allow manual sync even when background data is disabled
2009-09-15 18:20:10 -07:00
Elliott Hughes
5acf88ea09 am d6b10fb8: Merge change 25168 into eclair
Merge commit 'd6b10fb86229ed0e904138ec4604066ea85059db' into eclair-plus-aosp

* commit 'd6b10fb86229ed0e904138ec4604066ea85059db':
  Preload Resources$DefaultTimeZones.
2009-09-15 18:20:04 -07:00
Android (Google) Code Review
014ada2162 Merge change 25177 into eclair
* changes:
  Fix for #2092883: Allow manual sync even when background data is disabled
2009-09-15 21:17:44 -04:00
Android (Google) Code Review
ecda253aed Merge change 25168 into eclair
* changes:
  Preload Resources$DefaultTimeZones.
2009-09-15 21:15:38 -04:00
Nick Pelly
1ce7d04155 am e74050a9: Merge change 25175 into eclair
Merge commit 'e74050a9ca248eb6a8d3d8fc2d7712b340afddcc' into eclair-plus-aosp

* commit 'e74050a9ca248eb6a8d3d8fc2d7712b340afddcc':
  Allow only System Service to send most Bluetooth intents.
2009-09-15 18:15:24 -07:00
Dirk Dougherty
cdc4328c36 am 5d55edc9: am 3dc0f94c: Misc. updates for 1.6 release notes and requirements docs.
Merge commit '5d55edc9401c3240570b4cdc46eda7c4f4eac841' into eclair-plus-aosp

* commit '5d55edc9401c3240570b4cdc46eda7c4f4eac841':
  Misc. updates for 1.6 release notes and requirements docs.
2009-09-15 18:12:44 -07:00
Android (Google) Code Review
a0f59bb4d5 Merge change 25175 into eclair
* changes:
  Allow only System Service to send most Bluetooth intents.
2009-09-15 21:08:37 -04:00
Dirk Dougherty
6594a02f27 am 3dc0f94c: Misc. updates for 1.6 release notes and requirements docs.
Merge commit '3dc0f94cd44df2f9310946b0a0a1c7f8c6d95af5' into eclair

* commit '3dc0f94cd44df2f9310946b0a0a1c7f8c6d95af5':
  Misc. updates for 1.6 release notes and requirements docs.
2009-09-15 18:05:49 -07:00
Mathias Agopian
34f34cfa28 am 5446ea77: Merge change 25176 into eclair
Merge commit '5446ea77bcd7cf3d234f7198d073c99f6519662f' into eclair-plus-aosp

* commit '5446ea77bcd7cf3d234f7198d073c99f6519662f':
  fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
2009-09-15 17:41:49 -07:00
Mike Reed
d4fe2679d5 am 4e54f330: update for new plugin api
Merge commit '4e54f3309ec9dac3cf69ffa73ec7c5378f19dffb' into eclair-plus-aosp

* commit '4e54f3309ec9dac3cf69ffa73ec7c5378f19dffb':
  update for new plugin api
2009-09-15 17:37:16 -07:00
Android (Google) Code Review
8fb8663669 Merge change 25176 into eclair
* changes:
  fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
2009-09-15 20:35:15 -04:00
Mathias Agopian
d18afab9d6 fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer 2009-09-15 17:34:04 -07:00
Derek Sollenberger
e04c7da437 am 64ce0f8f: Merge change 24200 into eclair
Merge commit '64ce0f8f5315e3a364aea047360520b097e7a7cd' into eclair-plus-aosp

* commit '64ce0f8f5315e3a364aea047360520b097e7a7cd':
  First pass at replacing native plugin views with java.
2009-09-15 17:13:20 -07:00
Android (Google) Code Review
6dfc42c04c Merge change 24200 into eclair
* changes:
  First pass at replacing native plugin views with java.
2009-09-15 20:03:16 -04:00
Eric Fischer
ffc339e5b6 am b6a7ea54: Merge change 25153 into eclair
Merge commit 'b6a7ea540ef9537bcedc707a87514e63438a533a' into eclair-plus-aosp

* commit 'b6a7ea540ef9537bcedc707a87514e63438a533a':
  Reconcile the character popups for the hard and soft keyboards.
2009-09-15 16:48:12 -07:00
Romain Guy
0b3e00cc39 am 9c39c6d0: Merge change 25162 into eclair
Merge commit '9c39c6d02fc31e18f3abafb89cc29520cb539cb8' into eclair-plus-aosp

* commit '9c39c6d02fc31e18f3abafb89cc29520cb539cb8':
  Build the BitmapShader if it hasn't been built yet.
2009-09-15 16:48:06 -07:00
Android (Google) Code Review
98a84d09cb Merge change 25153 into eclair
* changes:
  Reconcile the character popups for the hard and soft keyboards.
2009-09-15 19:43:00 -04:00
Android (Google) Code Review
ca963ab9dd Merge change 25162 into eclair
* changes:
  Build the BitmapShader if it hasn't been built yet.
2009-09-15 19:40:58 -04:00
Libin Tang
aaf6373ad8 am d1d67782: Merge change 25147 into eclair
Merge commit 'd1d6778247d4b3798f9b9fafca4312a348826a0b' into eclair-plus-aosp

* commit 'd1d6778247d4b3798f9b9fafca4312a348826a0b':
  Fix call collision issue
2009-09-15 16:24:09 -07:00
Andreas Huber
d3f69b094a am 781a5dd5: Merge change 25142 into eclair
Merge commit '781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715' into eclair-plus-aosp

* commit '781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715':
  The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
2009-09-15 16:19:35 -07:00
Android (Google) Code Review
8ea7c779c3 Merge change 25147 into eclair
* changes:
  Fix call collision issue
2009-09-15 19:17:14 -04:00
Android (Google) Code Review
8e60fc0f40 Merge change 25142 into eclair
* changes:
  The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
2009-09-15 19:11:17 -04:00
Dmitri Plotnikov
968b9b074d am 90142c95: Adding a system property to log slow queries
Merge commit '90142c959e6de38eae1563cd8b3d2d448393e15f' into eclair-plus-aosp

* commit '90142c959e6de38eae1563cd8b3d2d448393e15f':
  Adding a system property to log slow queries
2009-09-15 16:03:59 -07:00
Andreas Huber
9943758704 am a4fe2aca: Merge change 25128 into eclair
Merge commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379' into eclair-plus-aosp

* commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379':
  Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
2009-09-15 14:51:30 -07:00
Andreas Huber
881f8c01e9 am 0edada08: Merge change 25101 into eclair
Merge commit '0edada085e175e81b6d38a48b5b022917b410a98' into eclair-plus-aosp

* commit '0edada085e175e81b6d38a48b5b022917b410a98':
  Added an API IOMX::createRendererFromJavaSurface.
2009-09-15 14:51:23 -07:00
Fred Quintana
7425f83be7 am 4b687f2e: Merge change 25132 into eclair
Merge commit '4b687f2eb5461da1d86189d19bfaaf669e24cd90' into eclair-plus-aosp

* commit '4b687f2eb5461da1d86189d19bfaaf669e24cd90':
  fix ContentProviderOperationTest
2009-09-15 14:51:16 -07:00
Android (Google) Code Review
1a3f52c9ac Merge change 25128 into eclair
* changes:
  Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
2009-09-15 17:48:33 -04:00
Android (Google) Code Review
aa503d787a Merge change 25101 into eclair
* changes:
  Added an API IOMX::createRendererFromJavaSurface.
2009-09-15 17:48:22 -04:00
Android (Google) Code Review
c063c00905 Merge change 25132 into eclair
* changes:
  fix ContentProviderOperationTest
2009-09-15 17:42:25 -04:00
Guang Zhu
515b1706c2 am 617d470d: Merge change 25124 into eclair
Merge commit '617d470dffdc0b5fa24454b0e07438ad0f4721f9' into eclair-plus-aosp

* commit '617d470dffdc0b5fa24454b0e07438ad0f4721f9':
  Add more error message if the script failed to pull result file from device.
2009-09-15 14:25:49 -07:00
Android (Google) Code Review
91c05074c1 Merge change 25124 into eclair
* changes:
  Add more error message if the script failed to pull result file from device.
2009-09-15 17:18:02 -04:00