Jean-Baptiste Queru
acfa590fc8
merge from donut
2009-08-03 07:45:45 -07:00
Jean-Baptiste Queru
110b314673
donut snapshot
2009-07-31 17:38:20 -07:00
Jean-Baptiste Queru
dee1b302ed
merge from donut
2009-07-29 14:57:05 -07:00
Jean-Baptiste Queru
02f54246f5
donut snapshot
2009-07-29 14:25:07 -07:00
Jean-Baptiste Queru
9261bae1d2
Merge korg/donut into korg/master
2009-07-25 21:15:25 -07:00
Jean-Baptiste Queru
4d3b5c1e36
donut snapshot
2009-07-21 11:16:54 -07:00
Shin-ichiro KAWASAKI
4cce5bd5cc
Bug Fixed for libagl.
2009-07-07 19:14:13 +09:00
Android Code Review
42e95078ff
Merge change 10365
...
* changes:
Fix hyphenation in TextView attr Javadoc
2009-06-14 09:03:07 -07:00
Android Code Review
269ef03a64
Merge change 10364
...
* changes:
Fix spelling mistakes in Javadoc
2009-06-14 09:02:24 -07:00
Android Code Review
dd7f658d0a
Merge change 10320
...
* changes:
Fixed typo, RFC3296 is for LDAP, RFC2396 is for URI
2009-06-12 09:46:54 -07:00
Android Code Review
9892ebb409
Merge change 10312
...
* changes:
Fix typo in adb commandline help
2009-06-12 09:45:48 -07:00
Android Code Review
b10172da8f
Merge change 10315
...
* changes:
Fix typo in Javadoc for LocationManager.GPS_PROVIDER
2009-06-12 09:44:57 -07:00
Android Code Review
772131b61a
Merge change 10317
...
* changes:
Clarify rules for package name in documentation
2009-06-12 09:43:29 -07:00
Android Code Review
7c60c220df
Merge change 10327
...
* changes:
Logical error. If multiple receivers are dead, only the first one will be added. found in http://code.google.com/p/android/issues/detail?id=2651
2009-06-10 17:03:05 -07:00
Android Code Review
a5b0f0a200
Merge change 10329
...
* changes:
Removed usage of tabs for indention
2009-06-10 13:29:09 -07:00
Android Code Review
f115c6d645
Merge change 10328
...
* changes:
Prevent IndexOutOfBoundsException on toString() if vibrate array is empty (non null) example: notification.vibrate = new long[0];
2009-06-10 13:28:56 -07:00
Android Code Review
6701a836ed
Merge change 10313
...
* changes:
Fix Configuration documentation for new constants
2009-06-09 12:44:39 -07:00
Jean-Baptiste Queru
512837cef2
Reconcile cupcake history into donut
...
Merge commit '5d6d773fab559fdc12e553d60d789f3991ac552c' into HEAD
2009-05-22 14:35:33 -07:00
Android Code Review
60015bd61c
Merge change 10027
...
* changes:
Fixed Issue 2682: ContentProvider query() SDK docs deprecated
2009-05-21 12:02:05 -07:00
Jean-Baptiste Queru
9660d304ae
donut snapshot
2009-05-20 11:28:04 -07:00
The Android Open Source Project
ad94c4189f
Merge commit 'korg/donut'
2009-04-24 13:54:57 -07:00
The Android Open Source Project
23525ac2a3
Merge commit 'korg/cupcake'
2009-04-14 18:18:03 -07:00
Dianne Hackborn
490b2ba510
AI 145382: API review: change new media keycode names to avoid ambiguity.
...
Updates the key maps. During this I noticed that the dream keymap didn't have all of the media buttons like the sapphire key map...! So this is now changed to match.
BUG=1779435
Automated import of CL 145382
2009-04-09 12:31:13 -07:00
Nick Pelly
cb5883ecc5
AI 144150: Fix heap corruption.
...
Take mutex in close(), and skip write path after turning bluetooth off.
BUG=1751710
Automated import of CL 144150
2009-04-01 16:40:01 -07:00
Eric Laurent
3c52588ca9
AI 143620: Attempt for fixing crash in AudioFlinger::MixerThread::dumpTracks() seen in bug report for issue 1747119.
...
AudioFlinger::MixerThread::dumpTracks() was reading mTracks[] vector instead of mActiveTracks[] when dumping active tracks.
BUG=1747119
Automated import of CL 143620
2009-03-31 09:38:57 -07:00
The Android Open Source Project
06ee417bc5
Merge commit 'korg/cupcake'
...
Conflicts:
core/java/android/webkit/WebView.java
core/java/android/widget/TwoLineListItem.java
preloaded-classes
2009-03-27 15:38:40 -07:00
Eric Laurent
b1596ee235
Automated import from //branches/cupcake/...@142889,142889
2009-03-26 01:57:59 -07:00
Mathias Agopian
192f79fe71
Automated import from //branches/cupcake/...@142875,142875
2009-03-25 23:26:39 -07:00
Mathias Agopian
ceff6e1874
Automated import from //branches/cupcake/...@142873,142873
2009-03-25 23:18:56 -07:00
Mathias Agopian
262453cecb
Automated import from //branches/cupcake/...@142856,142856
2009-03-25 21:42:35 -07:00
Dianne Hackborn
11d93f968c
Automated import from //branches/cupcake/...@142663,142663
2009-03-25 15:32:28 -07:00
Jack Palevich
df351ba573
Automated import from //branches/cupcake/...@142481,142481
2009-03-24 20:18:08 -07:00
Mathias Agopian
0348218e93
Automated import from //branches/cupcake/...@142445,142445
2009-03-24 19:43:24 -07:00
Mathias Agopian
2ed5f739eb
Automated import from //branches/cupcake/...@142427,142427
2009-03-24 19:41:37 -07:00
Andreas Huber
e4d3058e2f
Automated import from //branches/cupcake/...@141708,141708
2009-03-24 18:14:23 -07:00
Wu-cheng Li
ab9687f0f8
Automated import from //branches/cupcake/...@141613,141613
2009-03-24 18:01:34 -07:00
Jason Sams
4d45243cea
Automated import from //branches/cupcake/...@141597,141597
2009-03-24 17:58:31 -07:00
Android Code Review
f804114702
Merge
2009-03-23 15:26:38 -07:00
Android Code Review
66868deb80
Merge
2009-03-23 15:25:59 -07:00
The Android Open Source Project
0c2bcbc6cc
auto import from //branches/cupcake_rel/...@141571
2009-03-19 23:08:54 -07:00
The Android Open Source Project
4f68be1a5b
auto import from //branches/cupcake_rel/...@140373
2009-03-18 17:39:46 -07:00
Jean-Baptiste Queru
732ca39b70
Merge commit 'remotes/korg/cupcake' into merge
...
Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
2009-03-18 11:33:14 -07:00
Jean-Baptiste Queru
15c399644d
Revert "Add support for camera preview to be in overlay surfaces."
...
This reverts commit c35feb106e8ded282a261ae89075361ae5dc4214.
2009-03-18 11:08:56 -07:00
The Android Open Source Project
ebad147e65
auto import from //branches/cupcake_rel/...@138607
2009-03-13 13:04:22 -07:00
The Android Open Source Project
bcef13b666
auto import from //branches/cupcake/...@137873
2009-03-11 12:11:56 -07:00
The Android Open Source Project
22f8defddc
auto import from //branches/cupcake/...@137197
2009-03-09 11:52:12 -07:00
The Android Open Source Project
9adf84a4b6
auto import from //depot/cupcake/@136594
2009-03-05 14:34:35 -08:00
The Android Open Source Project
edbf3b6af7
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
The Android Open Source Project
d5193d9394
auto import from //depot/cupcake/@135843
2009-03-03 18:28:45 -08:00
James E. Blair
6015dfc996
Fix issue #1324 : No audible call-waiting indication when in-call volume
...
is low
http://code.google.com/p/android/issues/detail?id=1324
Re-base the internally generated in-call audio volume so that it is
never muted, which is already the case for the hardware routed in-call
audio.
2009-03-03 16:24:40 -08:00