10581 Commits

Author SHA1 Message Date
Marco Nelissen
6d391fcc05 am 04104665: Merge change I911458a0 into eclair
Merge commit '04104665271248719cb3659e42938fa4bec0261e' into eclair-plus-aosp

* commit '04104665271248719cb3659e42938fa4bec0261e':
  Fix x offset for boxed textures
2009-10-28 17:15:27 -07:00
Android (Google) Code Review
0410466527 Merge change I911458a0 into eclair
* changes:
  Fix x offset for boxed textures
2009-10-28 19:02:24 -04:00
Suchi Amalapurapu
cdf899435f am a47a1e77: Merge change Ic03d28b9 into eclair
Merge commit 'a47a1e77a4dc9510187f57d5cdf12f5ecf6b3ab0' into eclair-plus-aosp

* commit 'a47a1e77a4dc9510187f57d5cdf12f5ecf6b3ab0':
  Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
2009-10-28 15:37:27 -07:00
Android (Google) Code Review
a47a1e77a4 Merge change Ic03d28b9 into eclair
* changes:
  Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces again this flag gets set no matter what since the keyguard window is always present in the list of tokens and this hides the window which would have become visible since the keyguard just got dismissed. This causes unnecessary focus changes due to changes in visibility of current window.
2009-10-28 18:28:42 -04:00
Fred Quintana
c15027d332 am 5e5eb393: Merge change Id572ffc7 into eclair
Merge commit '5e5eb393729630800079206498f283de8f02f3a7' into eclair-plus-aosp

* commit '5e5eb393729630800079206498f283de8f02f3a7':
  don't throw an exception when we can't find a pending sync operation in the database
2009-10-28 15:14:57 -07:00
Marco Nelissen
911458a081 Fix x offset for boxed textures 2009-10-28 15:10:56 -07:00
Android (Google) Code Review
5e5eb39372 Merge change Id572ffc7 into eclair
* changes:
  don't throw an exception when we can't find a pending sync operation in the database
2009-10-28 18:05:09 -04:00
Mathias Agopian
134db3b2d6 am 85ade33e: fix [2071412] work around mdp 32-bits fade limitation
Merge commit '85ade33edcc7d9be462ad7b8455d27f6654aca5e' into eclair-plus-aosp

* commit '85ade33edcc7d9be462ad7b8455d27f6654aca5e':
  fix [2071412] work around mdp 32-bits fade limitation
2009-10-28 15:04:10 -07:00
Fred Quintana
cb41faa285 don't throw an exception when we can't find a pending sync operation in the database 2009-10-28 14:52:33 -07:00
Mathias Agopian
85ade33edc fix [2071412] work around mdp 32-bits fade limitation
in the case where we fade a 32-bits surface (ie: GL_MODULATE w/ a,a,a,a + blending),
we first make a copy of the background into a RGB buffer, then we blend the 32-bits
surface as usual (without the alpha component), and finally blend the copy of
the background on top with 1-a. This uses a lot of bandwidth, but no CPU time.
2009-10-28 14:49:44 -07:00
Suchi Amalapurapu
c03d28b9e9 Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
again this flag gets set no matter what since the keyguard window is always present in the list of tokens and this hides the window which would
have become visible since the keyguard just got dismissed.
This causes unnecessary focus changes due to changes in visibility of current window.

This will resolve issues related to current focus and time outs when dispatching key events.
2009-10-28 14:47:45 -07:00
Jean-Baptiste Queru
e17545e18f merge from open-source master 2009-10-28 13:42:51 -07:00
Christopher Tate
c2f735741b am 763ccae7: Merge change I8e7f5f07 into eclair
Merge commit '763ccae7d734cc7e55772936dc3f101a2bf453d4' into eclair-plus-aosp

* commit '763ccae7d734cc7e55772936dc3f101a2bf453d4':
  DO NOT MERGE: Fix loss of focus after wakeup into incall screen
2009-10-28 12:19:01 -07:00
Android (Google) Code Review
763ccae7d7 Merge change I8e7f5f07 into eclair
* changes:
  DO NOT MERGE: Fix loss of focus after wakeup into incall screen
2009-10-28 15:09:29 -04:00
Christopher Tate
405d089863 DO NOT MERGE: Fix loss of focus after wakeup into incall screen
Because of the asynchronous behavior of keyguard, and incall explicitly
disabling keyguard, sometimes the window manager would wind up in a state in
which the "correct" app and activity window were shown, but focus was
recalculated "too soon," at a time when keyguard was just about gone but not
quite, and incall was not yet fully shown.  In this case there was no currently
valid event target, but the final show of the incall window would not prompt a
focus recalculation, so that "no current focus" state would incorrectly persist,
resulting in spurious ANRs until some other phone activity forced a focus
update.

We now detect the problematic case when windows are shown, and make sure to
recalculate focus explicitly thereafter.  This change does *not* fix the
underlying race conditions that have been resulting in mismatched state within
the window manager, but it does force a validation pass that puts things in
order so that normal operation can continue.

Change-Id: I8e7f5f0795f0042a0da074aeed385e3fbc210360
2009-10-28 11:52:58 -07:00
Scott Main
62e4a4b76c am 25aa87b2: am d14f1bd7: Merge change Iacb6e122 into eclair-sdk
Merge commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120' into eclair-plus-aosp

* commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120':
  docs: add 2.0 video to developer site feature videos
2009-10-28 11:48:01 -07:00
Dirk Dougherty
cdf2c1bf26 am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdk
Merge commit '340fbc36fb5ded7819d09d55117917b9a6361fd4' into eclair-plus-aosp

* commit '340fbc36fb5ded7819d09d55117917b9a6361fd4':
  doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-28 11:47:47 -07:00
Scott Main
25aa87b2fd am d14f1bd7: Merge change Iacb6e122 into eclair-sdk
Merge commit 'd14f1bd7e4ba28489bdc472aa736aee5a587cb98' into eclair

* commit 'd14f1bd7e4ba28489bdc472aa736aee5a587cb98':
  docs: add 2.0 video to developer site feature videos
2009-10-28 11:40:09 -07:00
Dirk Dougherty
340fbc36fb am 5a4d6696: Merge change Ib80db923 into eclair-sdk
Merge commit '5a4d66965d3c5061d47201fcaa62c90d126e7187' into eclair

* commit '5a4d66965d3c5061d47201fcaa62c90d126e7187':
  doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-28 11:39:55 -07:00
Android (Google) Code Review
d14f1bd7e4 Merge change Iacb6e122 into eclair-sdk
* changes:
  docs: add 2.0 video to developer site feature videos
2009-10-28 14:27:48 -04:00
Scott Main
3141c707b8 docs: add 2.0 video to developer site feature videos 2009-10-28 11:21:31 -07:00
Eric Fischer
bf09620baf am fb872d1a: Merge change Id4d04def into eclair
Merge commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df' into eclair-plus-aosp

* commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df':
  Fix a race that kept the locale picker from working under heavy CPU load.
2009-10-28 10:24:53 -07:00
Android (Google) Code Review
fb872d1af3 Merge change Id4d04def into eclair
* changes:
  Fix a race that kept the locale picker from working under heavy CPU load.
2009-10-28 13:18:39 -04:00
Android (Google) Code Review
5a4d66965d Merge change Ib80db923 into eclair-sdk
* changes:
  doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
2009-10-28 11:56:04 -04:00
Jean-Michel Trivi
b029bd69ce am 89889733: Merge change I4e83a76a into eclair
Merge commit '898897338dfd62a268a89fb55ee900a9bd5a683f' into eclair-plus-aosp

* commit '898897338dfd62a268a89fb55ee900a9bd5a683f':
  Fix bug 2201417. Whenever the System setting that indicates
2009-10-28 08:53:31 -07:00
Android (Google) Code Review
898897338d Merge change I4e83a76a into eclair
* changes:
  Fix bug 2201417. Whenever the System setting that indicates whether the notifcation stream uses the ring volume changes, the table of stream volume aliases in AudioService is updated. But the name of the alias stored in VolumeStreamState.mVolumeIndexSettingName was not updated whenever the NOTIFICATIONS_USE_RING_VOLUME setting was updated. This caused the wrong volume setting to be persisted. This change ensures the setting name is updated whenever the volume alias is, and persists the notification volume change right away (instead of after a delay), so that registered observers are notified right away. The notification seekbar in the sound settings is an example of such an observer.
2009-10-28 11:47:54 -04:00
Jean-Baptiste Queru
a74dc60c96 Merge from donut 2009-10-28 08:32:40 -07:00
Jean-Baptiste Queru
6c63ee4fc4 Reconcile true history with open-source donut snapshots 2009-10-28 07:42:36 -07:00
Mike Lockwood
69dfa62308 am d376d240: Merge change I081f08c1 into eclair
Merge commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550' into eclair-plus-aosp

* commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550':
  A better solution for ignoring user activity while the screen is animating off.
2009-10-28 05:55:22 -07:00
Android (Google) Code Review
d376d2407b Merge change I081f08c1 into eclair
* changes:
  A better solution for ignoring user activity while the screen is animating off.
2009-10-28 08:46:06 -04:00
Mathias Agopian
e36f5af3ad am 7bde36e6: added GL test for textured lines
Merge commit '7bde36e64e66c81f0150d0372e1357a31f4ec704' into eclair-plus-aosp

* commit '7bde36e64e66c81f0150d0372e1357a31f4ec704':
  added GL test for textured lines
2009-10-28 02:16:14 -07:00
Mathias Agopian
7bde36e64e added GL test for textured lines 2009-10-28 02:09:21 -07:00
Mathias Agopian
59b2ee0dfd am 73e17015: Merge change I8d2de438 into eclair
Merge commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694' into eclair-plus-aosp

* commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694':
  fix [2143798] Need to figure out how to do video
2009-10-27 23:48:38 -07:00
Android (Google) Code Review
73e17015d3 Merge change I8d2de438 into eclair
* changes:
      fix [2143798] Need to figure out how to do video
2009-10-28 02:42:12 -04:00
Mike Lockwood
0506712068 A better solution for ignoring user activity while the screen is animating off.
Fixes a deadlock that occurred because mAnimatingScreenOff was left set to true
after aborting turning off the screen.
This change removes the mAnimatingScreenOff flag and checks for
(mScreenBrightness.animating && mScreenBrightness.targetValue == 0) instead.

Fixes bug b/2219706

Change-Id: I081f08c14ad7585a953fb567867238b1f3db841f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-27 23:13:39 -04:00
Dirk Dougherty
00dc5756b1 doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
Bug: 2160782
Change-Id: Ib80db9231f91a36f503db487982378b252c0fcd8
2009-10-27 18:58:54 -07:00
Eric Fischer
d4d04def2c Fix a race that kept the locale picker from working under heavy CPU load.
The locale picker and the activity transition would both change the
configuration, and depending upon the timing, the activity transition
would undo what the locale picker had just done.  Usually it worked right,
but would often fail if the user changed locales just after a data wipe,
when the media scanner was working hard in the background to index
the contents of the SD card.

http://b/issue?id=2216298
2009-10-27 18:55:57 -07:00
Jean-Michel Trivi
11a74a7565 Fix bug 2201417. Whenever the System setting that indicates
whether the notifcation stream uses the ring volume changes, the
table of stream volume aliases in AudioService is updated. But the
name of the alias stored in VolumeStreamState.mVolumeIndexSettingName
was not updated whenever the NOTIFICATIONS_USE_RING_VOLUME setting
was updated. This caused the wrong volume setting to be persisted.
This change ensures the setting name is updated whenever the volume
alias is, and persists the notification volume change right away
(instead of after a delay), so that registered observers are notified
right away. The notification seekbar in the sound settings is an
example of such an observer.
2009-10-27 17:49:13 -07:00
Dave Sparks
13eeaf1bb7 am 8321bdf4: Merge change I95529db1 into eclair
Merge commit '8321bdf4dd85b81224d84b0d7a2f53218bf1a250' into eclair-plus-aosp

* commit '8321bdf4dd85b81224d84b0d7a2f53218bf1a250':
  Add Free Flight ringtone to source tree.
2009-10-27 17:47:45 -07:00
Android (Google) Code Review
8321bdf4dd Merge change I95529db1 into eclair
* changes:
  Add Free Flight ringtone to source tree.
2009-10-27 20:36:13 -04:00
Scott Main
3a89fc4003 am 42522449: am 675eb31d: Merge change I1a010c12 into eclair-sdk
Merge commit '4252244939089ce0b055456335071bb7f2c0d1c3' into eclair-plus-aosp

* commit '4252244939089ce0b055456335071bb7f2c0d1c3':
  docs: fix broken link for download page.
2009-10-27 17:35:23 -07:00
Dave Sparks
95529db139 Add Free Flight ringtone to source tree. 2009-10-27 17:32:18 -07:00
Scott Main
4252244939 am 675eb31d: Merge change I1a010c12 into eclair-sdk
Merge commit '675eb31d8d3f349de3d4f8db11631aee0118d85d' into eclair

* commit '675eb31d8d3f349de3d4f8db11631aee0118d85d':
  docs: fix broken link for download page.
2009-10-27 17:27:13 -07:00
Android (Google) Code Review
675eb31d8d Merge change I1a010c12 into eclair-sdk
* changes:
  docs: fix broken link for download page.
2009-10-27 20:16:58 -04:00
Scott Main
1a010c1268 docs: fix broken link for download page.
a script was inserting a path that is no longer needed.
the removed class was the script identifier, so removing
this class means the path won't be added.
2009-10-27 17:02:12 -07:00
Ying Wang
3b447a2f41 am d85c4b34: Merge change Idb328ab7 into eclair
Merge commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35' into eclair-plus-aosp

* commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35':
  Explicitly specify that online-sdk depends on framework-res.
2009-10-27 16:08:58 -07:00
Android (Google) Code Review
d85c4b346f Merge change Idb328ab7 into eclair
* changes:
  Explicitly specify that online-sdk depends on framework-res.
2009-10-27 19:02:47 -04:00
Guang Zhu
17e37746d5 am aebcaec3: Merge change I2e90d640 into eclair
Merge commit 'aebcaec3c171f636a24051ce85ded2f86b09461b' into eclair-plus-aosp

* commit 'aebcaec3c171f636a24051ce85ded2f86b09461b':
  Remove the activity restart between urls.
2009-10-27 15:54:55 -07:00
Jason Sams
c04892b8bf am e9e50b57: Merge change I7136220b into eclair
Merge commit 'e9e50b57e03cfea2d0b9b540e5a2baa36e2d60e8' into eclair-plus-aosp

* commit 'e9e50b57e03cfea2d0b9b540e5a2baa36e2d60e8':
  Fix egl cleanup code on context teardown.
2009-10-27 15:51:12 -07:00
Android (Google) Code Review
aebcaec3c1 Merge change I2e90d640 into eclair
* changes:
  Remove the activity restart between urls.
2009-10-27 18:44:56 -04:00