Commit Graph

4432 Commits

Author SHA1 Message Date
Mike Lockwood
217132adbe am 1ff04118: Merge change 23693 into eclair
Merge commit '1ff041180c66ef6f1020cf5314a665d319e9ac86' into eclair-plus-aosp

* commit '1ff041180c66ef6f1020cf5314a665d319e9ac86':
  dumpstate: Add option to output to socket, disable code that switched to nonroot
2009-09-02 17:42:36 -07:00
Christian Sonntag
e9fdb8abe0 am ea6fca82: fix doc
Merge commit 'ea6fca8231c94064917e40dea23be8df50930cf9' into eclair-plus-aosp

* commit 'ea6fca8231c94064917e40dea23be8df50930cf9':
  fix doc
2009-09-02 17:40:51 -07:00
Android (Google) Code Review
ab78a8fe39 Merge change 23693 into eclair
* changes:
  dumpstate: Add option to output to socket, disable code that switched to nonroot
2009-09-02 17:40:20 -07:00
Christian Sonntag
8a35f8eb8f am 75f1d43b: Merge change 23738 into eclair
Merge commit '75f1d43b64cbf4b68ad62919a0c58907933ccd59' into eclair-plus-aosp

* commit '75f1d43b64cbf4b68ad62919a0c58907933ccd59':
  fix doc
2009-09-02 17:27:36 -07:00
Android (Google) Code Review
5a5a53d7d0 Merge change 23738 into eclair
* changes:
  fix doc
2009-09-02 17:25:35 -07:00
Dianne Hackborn
5761f1889e am 6db4303d: Merge change 23568 into eclair
Merge commit '6db4303d04d138cd2648b829306c4b1693ac12e8' into eclair-plus-aosp

* commit '6db4303d04d138cd2648b829306c4b1693ac12e8':
  Work on issue #2079167: Flickering issue across multiple UI
2009-09-02 17:24:02 -07:00
Android (Google) Code Review
36c8e9848d Merge change 23568 into eclair
* changes:
  Work on issue #2079167: Flickering issue across multiple UI
2009-09-02 17:21:35 -07:00
Dianne Hackborn
39bf918e21 Work on issue #2079167: Flickering issue across multiple UI
This addresses a few parts of the bug:

- There was a small issue in the window manager where we could show a window
  too early before the transition animation starts, which was introduced
  by the recent wallpaper work.  This was the cause of the flicker when
  starting the dialer for the first time.

- There was a much larger problem that has existing forever where moving
  an application token to the front or back was not synchronized with the
  application animation transaction.  This was the cause of the flicker
  when hanging up (now that the in-call screen moves to the back instead
  of closing and we always have a wallpaper visible).  The approach to
  solving this is to have the window manager go ahead and move the app
  tokens (it must in order to keep in sync with the activity manager), but
  to delay the actual window movement: perform the movement to front when
  the animation starts, and to back when it ends.  Actually, when the
  animation ends, we just go and completely rebuild the window list to
  ensure it is correct, because there can be ways people can add windows
  while in this intermediate state where they could end up at the wrong
  place once we do the delayed movement to the front or back.  And it is
  simply reasuring to know that every time we finish a full app transition,
  we re-evaluate the world and put everything in its proper place.

Also included in this change are a few little tweaks to the input system,
to perform better logging, and completely ignore input devices that do not
have any of our input classes.  There is also a little cleanup of evaluating
configuration changes to not do more work than needed when an input
devices appears or disappears, and to only log a config change message when
the config is truly changing.

Change-Id: Ifb2db77f8867435121722a6abeb946ec7c3ea9d3
2009-09-02 17:20:25 -07:00
Rebecca Schultz Zavin
656aada40e am 458e9186: Merge change 23720 into eclair
Merge commit '458e9186c175f87c420b7f82e91c0afa695c8ebb' into eclair-plus-aosp

* commit '458e9186c175f87c420b7f82e91c0afa695c8ebb':
  Add colorkey to gl clear operation
2009-09-02 17:07:41 -07:00
Fred Quintana
28b4edc629 am 14de0880: Merge change 23698 into eclair
Merge commit '14de0880dd7b716f39b822917e874ca5e579ff37' into eclair-plus-aosp

* commit '14de0880dd7b716f39b822917e874ca5e579ff37':
  suppress syncs until boot is complete
2009-09-02 17:07:35 -07:00
Android (Google) Code Review
dfcfc67381 Merge change 23720 into eclair
* changes:
  Add colorkey to gl clear operation
2009-09-02 17:05:31 -07:00
Android (Google) Code Review
9a93e323a3 Merge change 23698 into eclair
* changes:
  suppress syncs until boot is complete
2009-09-02 16:50:13 -07:00
Leon Scroggins
bf423b9e22 am f6ca7fab: Merge change 23690 into eclair
Merge commit 'f6ca7fab5043e1c3e834c15b4e674ae0c5c37d0d' into eclair-plus-aosp

* commit 'f6ca7fab5043e1c3e834c15b4e674ae0c5c37d0d':
  Prevent a crash when webkit changes the selection.
2009-09-02 16:47:20 -07:00
Grace Kloba
8836bdc3ac am 010bed74: Merge change 23723 into eclair
Merge commit '010bed7419e96f5310be25d9317405d360f90b9c' into eclair-plus-aosp

* commit '010bed7419e96f5310be25d9317405d360f90b9c':
  Get drawable directory for the platform buttons.
2009-09-02 16:47:14 -07:00
Android (Google) Code Review
99d6ddc0e2 Merge change 23690 into eclair
* changes:
  Prevent a crash when webkit changes the selection.
2009-09-02 16:45:33 -07:00
Android (Google) Code Review
525114139f Merge change 23723 into eclair
* changes:
  Get drawable directory for the platform buttons.
2009-09-02 16:44:52 -07:00
Suchi Amalapurapu
70158c1ac5 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
1da1528779 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
5981d09c60 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
a695753889 Merge change 23646 into eclair
* changes:
  Immediately destroy BluetoothSocket's on close().
2009-09-02 16:01:15 -07:00
Rebecca Schultz Zavin
29aa74c546 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
4d6bce8a35 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
7c1dcd9b9e 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
2e637e1a3b 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
e539d2b46b 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
0b82c0005c 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
b6061fd030 Merge change 23510 into eclair
* changes:
  SMS-to-email fix for messages from the web
2009-09-02 15:29:26 -07:00
Guang Zhu
69ef1b1e25 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
330c63999b 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
Jean-Baptiste Queru
76126d0683 Merge snapshot version of donut back into the main tree 2009-09-02 13:42:40 -07:00
Cedric Beust
d40476e9d4 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
Android (Google) Code Review
003c06c824 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
Cedric Beust
2770408096 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
57e866bfeb Merge change 23667 into eclair
* changes:
  Fix the -1 unread count bug.
2009-09-02 13:15:52 -07:00
jsh
3feae8b1ca 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
64cb450325 Merge change 23548 into eclair
* changes:
  Fix some sign in errors.
2009-09-02 13:01:59 -07:00
Jeff Hamilton
12fae510bc 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
af91f72434 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
5dd58af400 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
bb1e0eedd5 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
Eric Fischer
57c41af9ac am 66c70e13: Merge change 23529 into eclair
Merge commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e' into eclair-plus-aosp

* commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e':
  Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
2009-09-02 11:19:19 -07:00
Android (Google) Code Review
4cf95beea2 Merge change 23529 into eclair
* changes:
  Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
2009-09-02 11:17:18 -07:00
Andreas Huber
53bc0e0036 am 040571aa: Merge change 23632 into eclair
Merge commit '040571aa2f71031376ff37ffa827d3612eb89340' into eclair-plus-aosp

* commit '040571aa2f71031376ff37ffa827d3612eb89340':
  Increase buffer allocated to receive HTTP response, YouTube is rather verbose...
2009-09-02 10:26:13 -07:00
Android (Google) Code Review
75d9c2e964 Merge change 23632 into eclair
* changes:
  Increase buffer allocated to receive HTTP response, YouTube is rather verbose...
2009-09-02 10:05:45 -07:00
Christian Sonntag
28d9de4329 am 82b43d4f: Merge change 23631 into eclair
Merge commit '82b43d4f4ea56745be1ce9bc3b3a5e18e6222ac9' into eclair-plus-aosp

* commit '82b43d4f4ea56745be1ce9bc3b3a5e18e6222ac9':
  Add APANIC kernel logging to CheckinService.
2009-09-02 09:44:39 -07:00
Android (Google) Code Review
352c943f3f Merge change 23631 into eclair
* changes:
  Add APANIC kernel logging to CheckinService. we keep book and only read a particular file once and send it to the server.
2009-09-02 09:41:14 -07:00
Andreas Huber
1f17f0c51f am 854bcb95: Merge change 23539 into eclair
Merge commit '854bcb95ce5d8d75b843e8da1b691fa93395977c' into eclair-plus-aosp

* commit '854bcb95ce5d8d75b843e8da1b691fa93395977c':
  Squashed commit of the following:
2009-09-02 09:26:08 -07:00
Android (Google) Code Review
4798fd6c0a Merge change 23539 into eclair
* changes:
  Squashed commit of the following:
2009-09-02 09:22:49 -07:00
Dmitri Plotnikov
c0efc95f95 am bb54f93f: Merge change 23527 into eclair
Merge commit 'bb54f93ff66f382dc706b9fff508d386e046fdc2' into eclair-plus-aosp

* commit 'bb54f93ff66f382dc706b9fff508d386e046fdc2':
  Adding a convenience method to resolve contact lookup URI to a regular content URI
2009-09-02 08:42:46 -07:00
Android (Google) Code Review
214cf493e4 Merge change 23527 into eclair
* changes:
  Adding a convenience method to resolve contact lookup URI to a regular content URI
2009-09-02 08:38:32 -07:00