Commit Graph

4707 Commits

Author SHA1 Message Date
Dianne Hackborn
b102996078 am 3bb9c6d1: Merge change 23774 into eclair
Merge commit '3bb9c6d1f5b252dc3ed7eb069ff5aeabd2b02548' into eclair-plus-aosp

* commit '3bb9c6d1f5b252dc3ed7eb069ff5aeabd2b02548':
  Fix issue #2097189: can't set custom wallpaper
2009-09-02 22:47:42 -07:00
Dianne Hackborn
98c4e2ecdd am bdd52b26: Fix issue #2097060: Screen all messed up when setup wizard finished
Merge commit 'bdd52b264af8f562dd368d40b66771c88d45127f' into eclair-plus-aosp

* commit 'bdd52b264af8f562dd368d40b66771c88d45127f':
  Fix issue #2097060: Screen all messed up when setup wizard finished
2009-09-02 22:47:36 -07:00
Android (Google) Code Review
310b4c9b56 Merge change 23782 into eclair
* changes:
  Fix the issue that dialing *86 during call, the dialing voicemail screen is not shown.
2009-09-02 22:29:08 -07:00
Android (Google) Code Review
6832164e6f Merge change 23774 into eclair
* changes:
  Fix issue #2097189: can't set custom wallpaper
2009-09-02 22:20:29 -07:00
Tammo Spalink
d28595039b am fb16e5cc: Merge change 23607 into eclair
Merge commit 'fb16e5ccdb230a11cbbbfd17d323db7b88395c2f' into eclair-plus-aosp

* commit 'fb16e5ccdb230a11cbbbfd17d323db7b88395c2f':
  Reject (NAK) CDMA SMS with unknown teleservice ids.
2009-09-02 20:30:43 -07:00
Android (Google) Code Review
108662399d Merge change 23607 into eclair
* changes:
  Reject (NAK) CDMA SMS with unknown teleservice ids.
2009-09-02 20:29:09 -07:00
Scott Main
af6aa36f9a am 8f99b524: am b6b25d63: Merge change 23126 into donut
Merge commit '8f99b52484369a3a9221733c9817f6c09ba1ec85' into eclair-plus-aosp

* commit '8f99b52484369a3a9221733c9817f6c09ba1ec85':
  docs only.
2009-09-02 20:24:09 -07:00
Dmitri Plotnikov
6efadd7d04 am 622da682: Merge change 23765 into eclair
Merge commit '622da6829f11f0cacdbd6fe3b58f230d98115ed5' into eclair-plus-aosp

* commit '622da6829f11f0cacdbd6fe3b58f230d98115ed5':
  [Issue 2087123] Suppressing all exception when trying to load a photo for the in-call UI
2009-09-02 20:24:04 -07:00
Scott Main
748a073be8 am b6b25d63: Merge change 23126 into donut
Merge commit 'b6b25d63df8dd873c60ab056e5b0e0eda167cfb1' into eclair

* commit 'b6b25d63df8dd873c60ab056e5b0e0eda167cfb1':
  docs only.
2009-09-02 20:21:42 -07:00
Android (Google) Code Review
0b8d09ac02 Merge change 23126 into donut
* changes:
  docs only. add documentation about zipalign and new auto-signing procedures for Ant
2009-09-02 20:19:39 -07:00
Android (Google) Code Review
871837a79f Merge change 23765 into eclair
* changes:
  [Issue 2087123] Suppressing all exception when trying to load a photo for the in-call UI
2009-09-02 19:35:07 -07:00
Dirk Dougherty
b5ef5d8617 am 5f7cee89: am 2a2058f5: Merge change 23762 into donut
Merge commit '5f7cee89ca6670cefe91192e364037ee6ce39b19' into eclair-plus-aosp

* commit '5f7cee89ca6670cefe91192e364037ee6ce39b19':
  Add updated API diff based on 4.xml.
2009-09-02 19:34:00 -07:00
Dirk Dougherty
69c41b3f14 am 2a2058f5: Merge change 23762 into donut
Merge commit '2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5' into eclair

* commit '2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5':
  Add updated API diff based on 4.xml.
2009-09-02 19:32:02 -07:00
Android (Google) Code Review
ef8cb0d852 Merge change 23762 into donut
* changes:
  Add updated API diff based on 4.xml.
2009-09-02 19:29:45 -07:00
Dirk Dougherty
8416c92cae am 618ded26: am a6602f1f: Add docs for SDK update. Add redirects for preview files. Manually integrate a few doc changes from cupcake.
Merge commit '618ded26c61afbf907e72b4568a4f4f1c6c287a7' into eclair-plus-aosp

* commit '618ded26c61afbf907e72b4568a4f4f1c6c287a7':
  Add docs for SDK update.
2009-09-02 19:16:26 -07:00
Jason Sams
c0bb9622cc am e00d660a: Merge change 23584 into eclair
Merge commit 'e00d660aba91a7a682f83b2e0216296b0f3cca64' into eclair-plus-aosp

* commit 'e00d660aba91a7a682f83b2e0216296b0f3cca64':
  Simple app to create a gl2 context and dump the strings.
2009-09-02 19:16:20 -07:00
Dirk Dougherty
c7f3cc9c3b am a6602f1f: Add docs for SDK update. Add redirects for preview files. Manually integrate a few doc changes from cupcake.
Merge commit 'a6602f1fe4590e48c760f21ce29a92629240c463' into eclair

* commit 'a6602f1fe4590e48c760f21ce29a92629240c463':
  Add docs for SDK update.
2009-09-02 19:14:24 -07:00
Android (Google) Code Review
0774e765a8 Merge change 23584 into eclair
* changes:
  Simple app to create a gl2 context and dump the strings.
2009-09-02 19:13:10 -07:00
Dianne Hackborn
e54700aed4 am 6e478d7a: Merge change 23751 into eclair
Merge commit '6e478d7afb33eff4efe704a16b1a05435b431062' into eclair-plus-aosp

* commit '6e478d7afb33eff4efe704a16b1a05435b431062':
  Fix deadlock in wallpaper.
2009-09-02 18:20:52 -07:00
Android (Google) Code Review
36d5bedd4b Merge change 23751 into eclair
* changes:
  Fix deadlock in wallpaper.
2009-09-02 18:18:59 -07:00
Scott Main
ea6cb5e1d0 am 3e21bf47: am 96b7f921: Merge change 23565 into donut
Merge commit '3e21bf473a89688918f4e59fac4ba2d4539e3775' into eclair-plus-aosp

* commit '3e21bf473a89688918f4e59fac4ba2d4539e3775':
  docs only.
2009-09-02 18:00:28 -07:00
Scott Main
9a0820d571 am 96b7f921: Merge change 23565 into donut
Merge commit '96b7f921a5aea4264af1e0b4970263a3135c04d0' into eclair

* commit '96b7f921a5aea4264af1e0b4970263a3135c04d0':
  docs only.
2009-09-02 17:58:12 -07:00
Dianne Hackborn
bf8c7a1e73 am 78c951b2: Merge change 23704 into eclair
Merge commit '78c951b286ad6fc5300e2d30a624b7e9963202e7' into eclair-plus-aosp

* commit '78c951b286ad6fc5300e2d30a624b7e9963202e7':
  Fiddle system boot ordering.
2009-09-02 17:57:49 -07:00
Android (Google) Code Review
03283d3c02 Merge change 23704 into eclair
* changes:
  Fiddle system boot ordering.
2009-09-02 17:55:35 -07:00
Android (Google) Code Review
c254e26e3d Merge change 23565 into donut
* changes:
  docs only. add new announcement for 1.6 sdk to homepage
2009-09-02 17:55:32 -07:00
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