8105 Commits

Author SHA1 Message Date
Joshua Bloch
b1c3015f28 Fix xml file for recent Hashtable change. 2009-09-02 16:33:18 -07:00
Leon Scroggins
ef92e7a606 Prevent a crash when webkit changes the selection.
Partial fix for http://b/issue?id=2081673
This prevents a crash.  However, if the user continues typing
into the textfield, the selection is incorrect.  The real solution
(forthcoming), will make sure that the WebTextView's text gets
updated when webkit updates.

Change-Id: Ic832ec48fd4236c8116c5cbda1467677ad731feb
2009-09-02 19:31:33 -04:00
Suchi Amalapurapu
dcd49c9775 am 743a7495: am 23db1731: Merge change 23717 into eclair
Merge commit '743a7495ab365d8a84a25ac93e22b6e6e4c5e0b4'

* commit '743a7495ab365d8a84a25ac93e22b6e6e4c5e0b4':
  Make new attribute EXTRA_CHANGED_COMPONENT_NAME in
2009-09-02 16:29:28 -07:00
Suchi Amalapurapu
743a7495ab am 23db1731: Merge change 23717 into eclair
Merge commit '23db17314d32b56727123d21e3ca899a441c2a60' into eclair-plus-aosp

* commit '23db17314d32b56727123d21e3ca899a441c2a60':
  Make new attribute EXTRA_CHANGED_COMPONENT_NAME in
2009-09-02 16:26:48 -07:00
Android (Google) Code Review
23db17314d Merge change 23717 into eclair
* changes:
  Make new attribute EXTRA_CHANGED_COMPONENT_NAME in broadcast intent ACTION_PACKAGE_CHANGED public so that apps like launcher can find out the changed component name when loading changes made in components.
2009-09-02 16:25:01 -07:00
Nick Pelly
9ec3f29c52 am a457a5db: am d4c1baf9: Merge change 23646 into eclair
Merge commit 'a457a5dbb96fa5871360ea30f6d3157251f0932b'

* commit 'a457a5dbb96fa5871360ea30f6d3157251f0932b':
  Immediately destroy BluetoothSocket's on close().
2009-09-02 16:23:25 -07:00
Grace Kloba
83031581d6 Get drawable directory for the platform buttons.
Fix http://b/issue?id=2086818
2009-09-02 16:21:42 -07:00
Suchi Amalapurapu
32f589046b Make new attribute EXTRA_CHANGED_COMPONENT_NAME in
broadcast intent ACTION_PACKAGE_CHANGED public so that
apps like launcher can find out the changed component name
when loading changes made in components.
2009-09-02 16:11:14 -07:00
Andreas Huber
4c48342572 Setting the component role appears to be mandatory now for all mime types.
Also using CODEC_LOGV instead of vanilla LOGV to include the component name the message related to.
2009-09-02 16:05:36 -07:00
Nick Pelly
a457a5dbb9 am d4c1baf9: Merge change 23646 into eclair
Merge commit 'd4c1baf93708ad4e90c556e6041a498dbffaaba0' into eclair-plus-aosp

* commit 'd4c1baf93708ad4e90c556e6041a498dbffaaba0':
  Immediately destroy BluetoothSocket's on close().
2009-09-02 16:03:31 -07:00
Android (Google) Code Review
d4c1baf937 Merge change 23646 into eclair
* changes:
  Immediately destroy BluetoothSocket's on close().
2009-09-02 16:01:15 -07:00
Rebecca Schultz Zavin
c8546781ff Add colorkey to gl clear operation
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2009-09-02 15:57:42 -07:00
Jean-Baptiste Queru
92972944fa am 5d61af10: am 604637b5: am d3db17d8: Merge snapshot version of donut back into the main tree
Merge commit '5d61af10a4d4af72493201345ea92560f380c9e7'

* commit '5d61af10a4d4af72493201345ea92560f380c9e7':
  donut snapshot
2009-09-02 15:40:37 -07:00
Dianne Hackborn
82a823d3c8 am d79d627b: am f52e9f70: am e1b4437d: Revert "Fix content provider"
Merge commit 'd79d627b609b348e506488f2ab07bd4c73f9ef68'

* commit 'd79d627b609b348e506488f2ab07bd4c73f9ef68':
  Revert "Fix content provider"
2009-09-02 15:40:31 -07:00
Jean-Baptiste Queru
5d61af10a4 am 604637b5: am d3db17d8: Merge snapshot version of donut back into the main tree
Merge commit '604637b51c2c9d78b70440321d4a7056880935a5' into eclair-plus-aosp

* commit '604637b51c2c9d78b70440321d4a7056880935a5':
  donut snapshot
2009-09-02 15:37:48 -07:00
Dianne Hackborn
d79d627b60 am f52e9f70: am e1b4437d: Revert "Fix content provider"
Merge commit 'f52e9f703305a03e76f59ad41094c5bc8636d31c' into eclair-plus-aosp

* commit 'f52e9f703305a03e76f59ad41094c5bc8636d31c':
  Revert "Fix content provider"
2009-09-02 15:37:43 -07:00
Jean-Baptiste Queru
604637b51c am d3db17d8: Merge snapshot version of donut back into the main tree
Merge commit 'd3db17d8e8563c1629bc705ecded54a405d84b7e' into eclair

* commit 'd3db17d8e8563c1629bc705ecded54a405d84b7e':
  donut snapshot
2009-09-02 15:35:10 -07:00
Dianne Hackborn
f52e9f7033 am e1b4437d: Revert "Fix content provider"
Merge commit 'e1b4437dba7c33566af55d4e5d27d35729678684' into eclair

* commit 'e1b4437dba7c33566af55d4e5d27d35729678684':
  Revert "Fix content provider"
2009-09-02 15:35:01 -07:00
Satish Roddom
077fdd9f64 am 4e016f20: am 983b837e: Merge change 23510 into eclair
Merge commit '4e016f200094d262040d82559f3833dc809a4db8'

* commit '4e016f200094d262040d82559f3833dc809a4db8':
  SMS-to-email fix for messages from the web
2009-09-02 15:33:40 -07:00
Satish Roddom
4e016f2000 am 983b837e: Merge change 23510 into eclair
Merge commit '983b837ea1effc462ecd9c14620b19178f98fd92' into eclair-plus-aosp

* commit '983b837ea1effc462ecd9c14620b19178f98fd92':
  SMS-to-email fix for messages from the web
2009-09-02 15:31:13 -07:00
Android (Google) Code Review
983b837ea1 Merge change 23510 into eclair
* changes:
  SMS-to-email fix for messages from the web
2009-09-02 15:29:26 -07:00
Fred Quintana
4f9cfc5c52 suppress syncs until boot is complete 2009-09-02 15:20:23 -07:00
Jean-Baptiste Queru
78269b0fc0 manual merge 2009-09-02 14:18:52 -07:00
Guang Zhu
7146c51b04 am 29dab827: Merge change 23652 into eclair
Merge commit '29dab8278a53f02868dea5579c49a98018a21317' into eclair-plus-aosp

* commit '29dab8278a53f02868dea5579c49a98018a21317':
  Read forward address from file for DRT, fallback to default address
2009-09-02 14:09:26 -07:00
Android (Google) Code Review
29dab8278a Merge change 23652 into eclair
* changes:
  Read forward address from file for DRT, fallback to default address
2009-09-02 14:06:59 -07:00
Guang Zhu
b937ba138f Read forward address from file for DRT, fallback to default address
modified:   tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
2009-09-02 14:03:37 -07:00
Andreas Huber
da050cf206 Some work to make audio encoding work. 2009-09-02 14:01:43 -07:00
Jean-Baptiste Queru
d3db17d8e8 Merge snapshot version of donut back into the main tree 2009-09-02 13:42:40 -07:00
Jean-Baptiste Queru
8f4b5a5618 donut snapshot 2009-09-02 13:39:46 -07:00
Cedric Beust
7def92e2f1 am 04e1faf0: Merge change 23669 into eclair
Merge commit '04e1faf0f030ddb360180289fb798adbb3348dd4' into eclair-plus-aosp

* commit '04e1faf0f030ddb360180289fb798adbb3348dd4':
  Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).
2009-09-02 13:36:26 -07:00
Eric Fischer
17083d060e am 7a797a02: am 66c70e13: Merge change 23529 into eclair
Merge commit '7a797a02afafc1fcbdbe66d564f036c7ef38211f'

* commit '7a797a02afafc1fcbdbe66d564f036c7ef38211f':
  Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
2009-09-02 13:34:24 -07:00
Andreas Huber
221b2635a7 am 30a85367: am 040571aa: Merge change 23632 into eclair
Merge commit '30a85367eae2754039a5b4560032ae9c20574610'

* commit '30a85367eae2754039a5b4560032ae9c20574610':
  Increase buffer allocated to receive HTTP response, YouTube is rather verbose...
2009-09-02 13:34:04 -07:00
Christian Sonntag
6418672590 am 6fea727c: am 82b43d4f: Merge change 23631 into eclair
Merge commit '6fea727c4cf144ecd6118cfc9b96dea8692f9429'

* commit '6fea727c4cf144ecd6118cfc9b96dea8692f9429':
  Add APANIC kernel logging to CheckinService.
2009-09-02 13:33:50 -07:00
Andreas Huber
bd71a8351c am 56aa70f7: am 854bcb95: Merge change 23539 into eclair
Merge commit '56aa70f7f214f529b22d5bd8ed1679da87cab8cb'

* commit '56aa70f7f214f529b22d5bd8ed1679da87cab8cb':
  Squashed commit of the following:
2009-09-02 13:33:44 -07:00
Android (Google) Code Review
04e1faf0f0 Merge change 23669 into eclair
* changes:
  Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).
2009-09-02 13:33:43 -07:00
Dmitri Plotnikov
95b0710252 am db7dde6b: am bb54f93f: Merge change 23527 into eclair
Merge commit 'db7dde6bd3f6352bb9af3b03232a9407a53d87e2'

* commit 'db7dde6bd3f6352bb9af3b03232a9407a53d87e2':
  Adding a convenience method to resolve contact lookup URI to a regular content URI
2009-09-02 13:33:20 -07:00
Wu-cheng Li
876e5611bd am 35412cf5: am 14d8e6e5: Merge change 23609 into eclair
Merge commit '35412cf5ab4ae3dc110883dccf7d2ace3b469c58'

* commit '35412cf5ab4ae3dc110883dccf7d2ace3b469c58':
  Fix SDK build breakage.
2009-09-02 13:32:51 -07:00
Chung-yih Wang
a2e87dcfb4 am 585fb14c: am 940da983: Merge change 23585 into eclair
Merge commit '585fb14c56bd6cdce1f84246bad40e144dd1db61'

* commit '585fb14c56bd6cdce1f84246bad40e144dd1db61':
  Print error message if the buffer size is too small.
2009-09-02 13:32:45 -07:00
Chung-yih Wang
b21e2e1197 am c7585787: am 9c64d590: Merge change 23425 into eclair
Merge commit 'c75857873536d4206ba02c0f84fcd2dfd9bc05ea'

* commit 'c75857873536d4206ba02c0f84fcd2dfd9bc05ea':
  Store CA certificate chain into one single key entry with PEM format.
2009-09-02 13:32:39 -07:00
Wu-cheng Li
210eedeff7 am eb05398f: am 9b6a8ab8: Add camera parameters constants and methods.
Merge commit 'eb05398fcc598b252c3d5b0c09ea1da72bb8db0b'

* commit 'eb05398fcc598b252c3d5b0c09ea1da72bb8db0b':
  Add camera parameters constants and methods.
2009-09-02 13:32:16 -07:00
Cedric Beust
a010ef4d7e Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).
Change-Id: I154e27f615932bfcc08993aa361a6d2ffbc51d74
2009-09-02 13:24:52 -07:00
Cedric Beust
286996b26e am 682e30a8: Merge change 23667 into eclair
Merge commit '682e30a894bfe9600f5c216c008ec4fe26c3b954' into eclair-plus-aosp

* commit '682e30a894bfe9600f5c216c008ec4fe26c3b954':
  Fix the -1 unread count bug.
2009-09-02 13:18:41 -07:00
Android (Google) Code Review
682e30a894 Merge change 23667 into eclair
* changes:
  Fix the -1 unread count bug.
2009-09-02 13:15:52 -07:00
Cedric Beust
6f4a8a5861 Fix the -1 unread count bug.
Change-Id: I8b77ad3457504872928c1065d54f50c0618025b5
2009-09-02 13:12:26 -07:00
jsh
ffaa502e78 am 8ecd2aec: Merge change 23548 into eclair
Merge commit '8ecd2aecf66010e974d9125f40282168be76b440' into eclair-plus-aosp

* commit '8ecd2aecf66010e974d9125f40282168be76b440':
  Fix some sign in errors.
2009-09-02 13:05:05 -07:00
Android (Google) Code Review
8ecd2aecf6 Merge change 23548 into eclair
* changes:
  Fix some sign in errors.
2009-09-02 13:01:59 -07:00
Jeff Hamilton
baccdec934 am 0a299858: Merge change 23643 into eclair
Merge commit '0a29985895069cc7a34d5511a292d779eae36426' into eclair-plus-aosp

* commit '0a29985895069cc7a34d5511a292d779eae36426':
  Don't crash when a user taps on a fast track trigger that isn't hooked up to a contact.
2009-09-02 12:40:44 -07:00
Suchi Amalapurapu
2d18a24c93 am beea2690: Merge change 23323 into eclair
Merge commit 'beea2690008eaea5a901ff3ae748b01893e24e1b' into eclair-plus-aosp

* commit 'beea2690008eaea5a901ff3ae748b01893e24e1b':
  For intent ACTION_PACKAGE_CHANGED, there could be a lot of broadcasts related to enabling/disabling
2009-09-02 12:40:39 -07:00
Android (Google) Code Review
0a29985895 Merge change 23643 into eclair
* changes:
  Don't crash when a user taps on a fast track trigger that isn't hooked up to a contact.
2009-09-02 12:38:03 -07:00
Android (Google) Code Review
beea269000 Merge change 23323 into eclair
* changes:
      For intent ACTION_PACKAGE_CHANGED, there could be a lot of broadcasts related to enabling/disabling     components by apps which could result in thrashing on the PackageManager. For apps that     do not want to be restarted when such a broadcast is sent, we can just aggregate these broadcasts and     handle them at one go.     Changes include:     New structure to hold pending broadcasts by class name. If a component is enabled or disabled frequently     aggregate component enabled/disabled settings in this structure in a 10 second window and then     send out the accumulated list of broadcasts to the ActivityManager.     A new Handler implementation handles this message     Add new attribute name EXTRA_CHANGED_COMPONENT_NAME in broadcast intent Intent.ACTION_PACKAGE_CHANGED for     additional information for apps like Launcher.     Rename a couple of parameters, the names were too jarring.
2009-09-02 12:37:56 -07:00