27512 Commits

Author SHA1 Message Date
Jeff Brown
74278c7317 am 9c705411: am aab985b9: Fix touch input in landscape mode.
Merge commit '9c7054119a701b46758cc6e04878bb0961e18ae9'

* commit '9c7054119a701b46758cc6e04878bb0961e18ae9':
  Fix touch input in landscape mode.
2010-07-29 13:15:28 -07:00
Jeff Brown
9c7054119a am aab985b9: Fix touch input in landscape mode.
Merge commit 'aab985b951c4cf5ec2753ffbec516164b3c03c3a' into gingerbread-plus-aosp

* commit 'aab985b951c4cf5ec2753ffbec516164b3c03c3a':
  Fix touch input in landscape mode.
2010-07-29 13:13:38 -07:00
Jeff Brown
0d1e941914 am b0a57502: (-s ours) am 6ec402b5: DO NOT MERGE: Fix input event injection ANRs on UI thread.
Merge commit 'b0a57502c6f17edd1a63bee1463bc2f9fd78e4a4'

* commit 'b0a57502c6f17edd1a63bee1463bc2f9fd78e4a4':
  DO NOT MERGE: Fix input event injection ANRs on UI thread.
2010-07-29 13:13:15 -07:00
Jeff Brown
b0a57502c6 am 6ec402b5: DO NOT MERGE: Fix input event injection ANRs on UI thread.
Merge commit '6ec402b5ae33c8927694d8522b4cc6a5c8ba974e' into gingerbread-plus-aosp

* commit '6ec402b5ae33c8927694d8522b4cc6a5c8ba974e':
  DO NOT MERGE: Fix input event injection ANRs on UI thread.
2010-07-29 13:09:07 -07:00
Jeff Brown
aab985b951 Fix touch input in landscape mode.
Change-Id: I7d47e9b02e6443ed604a6bf842028a5db934d90d
2010-07-29 13:05:52 -07:00
Dianne Hackborn
5132b37018 Fix issue #2859543: PhoneStatusBar appears at startup after wipe
Change-Id: I63c8fcd7152a99ba7f2c3d57a5ad9ceaf05529d7
2010-07-29 13:05:34 -07:00
Jeff Brown
6ec402b5ae DO NOT MERGE: Fix input event injection ANRs on UI thread.
Added a new asynchronous injection mode and made the existing
synchronization mechanism more robust.

Change-Id: Ia4aa04fd9b75ea2461a844c5b7933c831c1027e6
2010-07-29 12:54:27 -07:00
Daniel Sandler
571a629f29 Merge "Show notification icons in the system bar." 2010-07-29 12:45:15 -07:00
Daniel Sandler
3eebd1ffbf Show notification icons in the system bar.
Caveats:
 - Ongoing and normal are lumped together
 - Currently no limit on number of icons (should be 4)
 - Still can't see the notifications in the panel

Change-Id: I83ac474db6ff290207d37747b672a1a56788a238
2010-07-29 15:42:11 -04:00
Jeff Brown
bbda99d208 Fixed StatusBar ANRs due to input event injection on UI thread.
Added a new asynchronous injection mode and made the existing
synchronization mechanism more robust.

Change-Id: I0464f70ff5cbd519dbb02686b2cb5d810fe7dbb2
2010-07-29 12:19:08 -07:00
Andreas Huber
26d9b9870e am 42556025: am 6dea6f4e: am 16263d9f: Squashed commit of the following:
Merge commit '425560259c6d41e7f413fdd0f517dc47f350c533'

* commit '425560259c6d41e7f413fdd0f517dc47f350c533':
  Squashed commit of the following:
2010-07-29 11:15:09 -07:00
Andreas Huber
425560259c am 6dea6f4e: am 16263d9f: Squashed commit of the following:
Merge commit '6dea6f4e71b53e421564d783c227cbe0a2469183' into gingerbread-plus-aosp

* commit '6dea6f4e71b53e421564d783c227cbe0a2469183':
  Squashed commit of the following:
2010-07-29 11:11:46 -07:00
Chet Haase
12517fe56c Fix the build for the new API added in previous checkin
Change-Id: I5c0bc68a991ab5817ed7f4f80fd4fc64c83c367d
2010-07-29 11:10:51 -07:00
Andreas Huber
6dea6f4e71 am 16263d9f: Squashed commit of the following:
Merge commit '16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread

* commit '16263d9f8cc01392c2f3678b381ce897647c8c81':
  Squashed commit of the following:
2010-07-29 11:07:49 -07:00
Chet Haase
8cde663511 Merge "Make the new android.animation package public" 2010-07-29 10:33:47 -07:00
Eric Fischer
a5253899ea Merge "Add character limit for translators." 2010-07-29 10:17:21 -07:00
Andreas Huber
16263d9f8c Squashed commit of the following:
commit 4abf16bb04dc9695fedf4007a84f903074312ccd
Author: Andreas Huber <andih@google.com>
Date:   Tue Jul 20 09:21:17 2010 -0700

    Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.

    Change-Id: Icc790122744745e9a88099788d4818ca1e265a82
    related-to-bug: 2826841

commit 09c74da63e6ad5cb5dafb70f62696d75d2978967
Author: James Dong <jdong@google.com>
Date:   Sun Jul 18 17:57:01 2010 -0700

    Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.

    Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8

commit f672bf2a782dc7d5fb6325d611a7fe17045dfe9a
Author: James Dong <jdong@google.com>
Date:   Thu Jul 8 20:56:13 2010 -0700

    Enable the support for decoding audio with AAC+ and eAAC+ features

    bug - 282684

    Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b

Change-Id: I012f1179e933b6d1345d2368f357576c722485f7
2010-07-29 09:45:06 -07:00
Maksymilian Osowski
b969722c5b Merge "Upgraded DRT2 to generate nice HTML summaries of the tests." 2010-07-29 09:19:36 -07:00
Maksymilian Osowski
6d0dae6a65 Upgraded DRT2 to generate nice HTML summaries of the tests.
Change-Id: Ibe4ee3af30fe20aeab2f3fed9c4c5693c9a0f268
2010-07-29 17:17:36 +01:00
Chet Haase
3b69b6f0be Make the new android.animation package public
Change-Id: Iff31676f25fc989707a1e17fb172296014a22c27
2010-07-29 09:09:05 -07:00
Mike Lockwood
81cf771478 am 7522cac5: am 8dc16c27: Fix typo in GPS mode logic.
Merge commit '7522cac555bd8010d6603cfe0ad831a6f1c1af4f'

* commit '7522cac555bd8010d6603cfe0ad831a6f1c1af4f':
  Fix typo in GPS mode logic.
2010-07-29 09:06:10 -07:00
Mike Lockwood
7522cac555 am 8dc16c27: Fix typo in GPS mode logic.
Merge commit '8dc16c27e23dae5bdf65fd2a2ced97c2f645a633' into gingerbread-plus-aosp

* commit '8dc16c27e23dae5bdf65fd2a2ced97c2f645a633':
  Fix typo in GPS mode logic.
2010-07-29 08:58:54 -07:00
Brian Carlstrom
f5baf046e1 Merge "Tracking merge of dalvik-dev to master" 2010-07-29 08:46:07 -07:00
Mike Lockwood
8dc16c27e2 Fix typo in GPS mode logic.
MS-Assisted support should not be required for using MS-Based mode.

Change-Id: Ia6ee219674de3e9cc13190b753f8776305a4fa90
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-29 11:39:55 -04:00
Eric Laurent
efd58e5fd0 am ba676a00: am a54d7d3d: Fixed underrun in audioflinger mixer.
Merge commit 'ba676a00c1b9ba59b30fe805b83d03d1768fffbd'

* commit 'ba676a00c1b9ba59b30fe805b83d03d1768fffbd':
  Fixed underrun in audioflinger mixer.
2010-07-29 07:46:03 -07:00
Eric Laurent
ba676a00c1 am a54d7d3d: Fixed underrun in audioflinger mixer.
Merge commit 'a54d7d3d7dd691334189aab20d23c65710092869' into gingerbread-plus-aosp

* commit 'a54d7d3d7dd691334189aab20d23c65710092869':
  Fixed underrun in audioflinger mixer.
2010-07-29 07:43:10 -07:00
Eric Laurent
a54d7d3d7d Fixed underrun in audioflinger mixer.
When all audio tracks have been disabled and the mixer is running idle before the output stream is placed in standby,
the mixer sometimes fails to write to the output stream on time to avoid underrun.

This is because the sleep period used to wait before the next write to output stream is too close to the actual buffer duration.
In fact this sleep time is not critical as if we write too early to the output stream, the kernel driver will wait for free buffers
from the audio DSP DMA and we will sleep anyways.

The fix consists in dividing the calculated wait period by 2 to increase the margin.

Change-Id: I5730887dc2ccce2a511bc858494a6f7da6b392a0
2010-07-29 06:50:24 -07:00
Eric Laurent
e199f1dddb am 45dc4f82: am 493941b8: Allow creation of an audio effect on a session with no audio tracks.
Merge commit '45dc4f82a00e52b12389b22a7cfbbee5609e8e28'

* commit '45dc4f82a00e52b12389b22a7cfbbee5609e8e28':
  Allow creation of an audio effect on a session with no audio tracks.
2010-07-29 05:22:10 -07:00
Eric Laurent
45dc4f82a0 am 493941b8: Allow creation of an audio effect on a session with no audio tracks.
Merge commit '493941b8d8a12ee843d9823c0177f8005a7be54f' into gingerbread-plus-aosp

* commit '493941b8d8a12ee843d9823c0177f8005a7be54f':
  Allow creation of an audio effect on a session with no audio tracks.
2010-07-29 03:35:52 -07:00
Eric Laurent
493941b8d8 Allow creation of an audio effect on a session with no audio tracks.
This is necessary to allow creating and enabling an effect attached to a particular player
session before the playback is started. As a matter of fact, the implementation of the mediaplayer
does not create the AudioTrack before playback starts.

Change-Id: I1266e8885f9d756acc949303321aaac0fbf83e34
2010-07-29 02:34:40 -07:00
Brian Carlstrom
5e8a587d49 Tracking merge of dalvik-dev to master
Change-Id: Id4c19401ad0aa238219aaf5d9a20d2889d0a4b18
2010-07-28 23:49:30 -07:00
Dmitri Plotnikov
aae052324f Merge "Throws IllegalArgumentException if the country code is null." 2010-07-28 20:37:26 -07:00
Bai Tao
1e80299bd4 Throws IllegalArgumentException if the country code is null.
Also removed unnecessary Locale check

Change-Id: I547713372900f1ea71e2215c0023a0981b6aca94
2010-07-28 20:33:28 -07:00
Gilles Debunne
aa6d39218b Merge "Fixes regarding densities in "Providing Resources" documentation page." 2010-07-28 18:38:56 -07:00
Chris Tate
98d4a5cfd4 am 4dc8ead1: am 7b40518e: Merge "Change unistd.h to stddef.h to be correct" into gingerbread
Merge commit '4dc8ead1b4e63165c0a9e65adfbe46159758947a'

* commit '4dc8ead1b4e63165c0a9e65adfbe46159758947a':
  Change unistd.h to stddef.h to be correct
2010-07-28 18:18:28 -07:00
Chris Tate
4dc8ead1b4 am 7b40518e: Merge "Change unistd.h to stddef.h to be correct" into gingerbread
Merge commit '7b40518e56a3238b28b24a786a2ff22d5a425765' into gingerbread-plus-aosp

* commit '7b40518e56a3238b28b24a786a2ff22d5a425765':
  Change unistd.h to stddef.h to be correct
2010-07-28 18:16:14 -07:00
Chris Tate
7b40518e56 Merge "Change unistd.h to stddef.h to be correct" into gingerbread 2010-07-28 18:14:51 -07:00
Adam Powell
e65923f513 Merge "Add support for setting action bar title/subtitle by resource ID" 2010-07-28 18:10:06 -07:00
Dmitri Plotnikov
13e470e80a Merge "Added country based formatNumber methods" 2010-07-28 18:06:27 -07:00
Adam Powell
a66c7b0456 Add support for setting action bar title/subtitle by resource ID
Change-Id: I91b6f56bd3736fd7cc8b82cbbf0b7be2e1c718e5
2010-07-28 18:02:48 -07:00
Irfan Sheriff
34fe791453 Handle loss of supplicant events at start
If the supplicant events are lost even before connection,
we stay stuck without doing IP address.
The earlier implementation used polling at connection to handle
this case.
A disconnect after connection handles this cleanly.

Bug: 2876987
Change-Id: I7509c5f332f87b91e1ff8438cf859a0e49df2e6d
2010-07-28 17:40:20 -07:00
Chet Haase
f54a8d7c47 Adding xml declarations for new animation framework
Change-Id: Ic789e47790cf24d1c4b3bcbe9048b992ab93517b
2010-07-28 17:22:14 -07:00
Brett Chabot
2af53220c9 am 6487ade9: am 5f866a4a: Make FrameworkCoreHostTests use ddmlib-prebuilt.
Merge commit '6487ade97ae4ad801681c866c846ed8862454ec4'

* commit '6487ade97ae4ad801681c866c846ed8862454ec4':
  Make FrameworkCoreHostTests use ddmlib-prebuilt.
2010-07-28 17:14:29 -07:00
Brett Chabot
6487ade97a am 5f866a4a: Make FrameworkCoreHostTests use ddmlib-prebuilt.
Merge commit '5f866a4ac389a18613180b056d946ae5a7b84e10' into gingerbread-plus-aosp

* commit '5f866a4ac389a18613180b056d946ae5a7b84e10':
  Make FrameworkCoreHostTests use ddmlib-prebuilt.
2010-07-28 17:11:01 -07:00
Gilles Debunne
3e0a3d5b48 Fixes regarding densities in "Providing Resources" documentation page.
The ratio between densities is not constant.

The Exception for dpi qualifier in point 4 of the algorithm should be detailed.

I understand that if my config is ldpi-trackball-v5
and I have the choice between mdpi and hdpi-trackball-v5, mdpi will be chosen.

Change-Id: Icf7494c23f7e3af7d3c6aab770d0ba3c1fea2ebf
2010-07-28 17:08:15 -07:00
Adam Powell
4767928c3e Merge "Add support for setting action mode titles/subtitles by resource ID" 2010-07-28 17:04:56 -07:00
Adam Powell
589f15556b am c6d83caf: am a0ae8bc5: Merge "Fix a bug that could cause flings to last too long using a Scroller" into gingerbread
Merge commit 'c6d83cafed6e60223c28da328f845998e27bfae0'

* commit 'c6d83cafed6e60223c28da328f845998e27bfae0':
  Fix a bug that could cause flings to last too long using a Scroller
2010-07-28 17:01:35 -07:00
Adam Powell
c9ae2a24dc Add support for setting action mode titles/subtitles by resource ID
Change-Id: Ia0d5234cc16f325eeb29127fb87e2616d67379ec
2010-07-28 17:00:02 -07:00
Adam Powell
c6d83cafed am a0ae8bc5: Merge "Fix a bug that could cause flings to last too long using a Scroller" into gingerbread
Merge commit 'a0ae8bc5c62b12269f20cbebdb0d8614e4e8eb1a' into gingerbread-plus-aosp

* commit 'a0ae8bc5c62b12269f20cbebdb0d8614e4e8eb1a':
  Fix a bug that could cause flings to last too long using a Scroller
2010-07-28 16:58:45 -07:00
Adam Powell
a0ae8bc5c6 Merge "Fix a bug that could cause flings to last too long using a Scroller" into gingerbread 2010-07-28 16:56:13 -07:00