27600 Commits

Author SHA1 Message Date
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
Kenny Root
a4879bad70 Change unistd.h to stddef.h to be correct
size_t should be defined through inclusion of stddef.h instead of unistd.h

Change-Id: Ieaadacfca1e1c44c2533ea95f73fc060c1519b52
2010-07-28 16:46:12 -07:00
Kenny Root
48555f8f09 am 31a0b956: am 3de27d5a: Merge "Add stdint.h to fix sim-eng" into gingerbread
Merge commit '31a0b956396e417bdbfee97554afb5b52d68a8ba'

* commit '31a0b956396e417bdbfee97554afb5b52d68a8ba':
  Add stdint.h to fix sim-eng
2010-07-28 16:44:56 -07:00
Adam Powell
1b088be8bb Fix a bug that could cause flings to last too long using a Scroller
Bug 2866552

Change-Id: I6979b3da54ca2aeaf4583629e28ee81fa5bd70da
2010-07-28 16:43:45 -07:00
Kenny Root
31a0b95639 am 3de27d5a: Merge "Add stdint.h to fix sim-eng" into gingerbread
Merge commit '3de27d5a56f4b9e3d76ac71445b33e47c635d207' into gingerbread-plus-aosp

* commit '3de27d5a56f4b9e3d76ac71445b33e47c635d207':
  Add stdint.h to fix sim-eng
2010-07-28 16:43:08 -07:00
Gilles Debunne
fc8ae40da0 Merge "Fixed doc typos in HeterogeneousExpandableList.java." 2010-07-28 16:43:07 -07:00
Kenny Root
3de27d5a56 Merge "Add stdint.h to fix sim-eng" into gingerbread 2010-07-28 16:41:49 -07:00
Kenny Root
d1548557ab am 47cf709a: am 8c5d9430: Merge "Add unistd.h for size_t typedef to fix sim-eng" into gingerbread
Merge commit '47cf709aa3c07d2573340187edb5e11ea75824b1'

* commit '47cf709aa3c07d2573340187edb5e11ea75824b1':
  Add unistd.h for size_t typedef to fix sim-eng
2010-07-28 16:41:36 -07:00
Kenny Root
e30de4e6a3 Add stdint.h to fix sim-eng
Change-Id: I82cebe3e769aa4db99bd758bd2f182b0d462de6f
2010-07-28 16:41:02 -07:00
Kenny Root
47cf709aa3 am 8c5d9430: Merge "Add unistd.h for size_t typedef to fix sim-eng" into gingerbread
Merge commit '8c5d9430d2f029be0c1100f7b3c38a2fb9fe99b6' into gingerbread-plus-aosp

* commit '8c5d9430d2f029be0c1100f7b3c38a2fb9fe99b6':
  Add unistd.h for size_t typedef to fix sim-eng
2010-07-28 16:39:52 -07:00
Kenny Root
8c5d9430d2 Merge "Add unistd.h for size_t typedef to fix sim-eng" into gingerbread 2010-07-28 16:37:20 -07:00
Mathias Agopian
fdbb58cb11 am 9362ea76: am 9f2a91bc: Merge "fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread
Merge commit '9362ea760f565389f5accce7e17476d05510ed59'

* commit '9362ea760f565389f5accce7e17476d05510ed59':
  fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
2010-07-28 16:36:08 -07:00
Mathias Agopian
9362ea760f am 9f2a91bc: Merge "fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread
Merge commit '9f2a91bc2b01c2cc60f73a0bae673225fdddec09' into gingerbread-plus-aosp

* commit '9f2a91bc2b01c2cc60f73a0bae673225fdddec09':
  fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
2010-07-28 16:33:23 -07:00
Kenny Root
9d90ed71cc Add unistd.h for size_t typedef to fix sim-eng
Change-Id: Ida4f1742547f39539b601f13182c722aa7cf863e
2010-07-28 16:31:24 -07:00
Mathias Agopian
9f2a91bc2b Merge "fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread 2010-07-28 16:30:56 -07:00
Eric Fischer
359d79f317 Add character limit for translators.
Change-Id: If3d77fed7ebc1ef08c546b7f7d32177b4d80d2b9
2010-07-28 16:27:18 -07:00
Gilles Debunne
8e364ed01a Fixed doc typos in HeterogeneousExpandableList.java.
Bad links.

Change-Id: I9a596a05494c4d8621e2914357e4052a5cec889a
2010-07-28 16:11:36 -07:00
Dianne Hackborn
42c2936f3c Add PreferenceFragment.
Change-Id: I9b87ec2c15822cca5b460a9a2d589fc24e21a789
2010-07-28 16:06:58 -07:00
Steve Howard
7083c42fff Update Context.getSystemService() docs for download manager.
Change-Id: Ic514b3289b38d6da7d5fe4ffc87c6865280d66d8
2010-07-28 16:01:23 -07:00
Bai Tao
fae6ec9e96 Added country based formatNumber methods
a. Format the number to E164.
b. Format the number based on country convention.
c. Normailize the number.

Change-Id: I39d59b99aa1a5136371dd20c74d9d9c8ec855369
2010-07-29 06:54:25 +08:00
Gilles Debunne
db4c6ccf22 Merge "TextView with Selection Contextual Mode" 2010-07-28 15:49:40 -07:00
Gilles Debunne
f788a9fccd TextView with Selection Contextual Mode
Context menu entries have been moved to a contextual mode in the action bar.

Change Input Method has been removed and *should be added to the system bar instead*.

Add word to dictionnary has also been removed and should now be done using the suggestioni
bar "tap on word to add" feature.

Change-Id: I767373f53515b2d6a06500321b4b12ed0b05a9b6
2010-07-28 15:46:35 -07:00