Commit Graph

52474 Commits

Author SHA1 Message Date
Mathias Agopian 7c143aab44 Automated import from //branches/master/...@142447,142447 2009-03-24 22:50:50 -07:00
Mathias Agopian b535e58351 Automated import from //branches/master/...@142432,142432 2009-03-24 22:49:21 -07:00
Jack Palevich 87d80228cc Automated import from //branches/donutburger/...@142484,142484 2009-03-24 22:48:26 -07:00
Mathias Agopian 74c770be33 Automated import from //branches/donutburger/...@142446,142446 2009-03-24 22:43:22 -07:00
Mathias Agopian 6219dd7d3a Automated import from //branches/donutburger/...@142430,142430 2009-03-24 22:42:15 -07:00
Andy McFadden 3d82f1cc86 Automated import from //branches/master/...@141993,141993 2009-03-24 21:20:43 -07:00
Andy McFadden 4442661817 Automated import from //branches/donutburger/...@141992,141992 2009-03-24 21:16:04 -07:00
Niko Catania 3302cebdd5 Automated import from //branches/master/...@141784,141784 2009-03-24 20:55:36 -07:00
Niko Catania c8f10f8374 Automated import from //branches/donutburger/...@141782,141782 2009-03-24 20:53:55 -07:00
Andreas Huber 715222bb03 Automated import from //branches/master/...@141712,141712 2009-03-24 20:48:51 -07:00
Andreas Huber a26e6060f3 Automated import from //branches/donutburger/...@141711,141711 2009-03-24 20:47:19 -07:00
Wu-cheng Li 7110bf708f Automated import from //branches/master/...@141615,141615 2009-03-24 20:39:31 -07:00
Wu-cheng Li aab44b8cca Automated import from //branches/donutburger/...@141614,141614 2009-03-24 20:39:09 -07:00
Jason Sams 6023a5c6b1 Automated import from //branches/master/...@141599,141599 2009-03-24 20:37:37 -07:00
Jason Sams 9e431ace32 Automated import from //branches/donutburger/...@141598,141598 2009-03-24 20:36:57 -07:00
Mathias Agopian e74be0afd9 Automated import from //branches/master/...@141504,141504 2009-03-24 20:25:55 -07:00
Mathias Agopian 3df5e433a2 Automated import from //branches/donutburger/...@141502,141502 2009-03-24 20:25:29 -07:00
Jason Sams 3cff302213 Automated import from //branches/master/...@141471,141471 2009-03-24 20:21:49 -07:00
Jason Sams 78b877e7e6 Automated import from //branches/donutburger/...@141469,141469 2009-03-24 20:21:36 -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
Mathias Agopian 38c89491e4 Automated import from //branches/donutburger/...@140807,140807 2009-03-24 18:34:22 -07:00
Mathias Agopian 7a7af5c866 Automated import from //branches/master/...@140808,140808 2009-03-24 18:34:16 -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
Jean-Baptiste Queru 2936ad176e Merge commit 'remotes/korg/cupcake' into merge 2009-03-17 16:08:44 -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
The Android Open Source Project 43aa2b1cbf auto import from //depot/cupcake/@132589 2009-03-03 14:04:24 -08:00
The Android Open Source Project 0bb03408de auto import from //depot/cupcake/@137055 2009-03-02 22:54:33 -08:00
Android Code Review 007452f719 Merge 2009-03-02 14:18:07 -08:00
Android Code Review 3eac1e5675 Merge 2009-03-02 13:20:13 -08:00
Adrian Taylor f18936cbf4 Fixing LayerScreenshot bitmap config value. 2009-03-02 12:11:47 -08:00
Android Code Review c81f8824b3 Merge 2009-03-02 10:44:11 -08:00
The Android Open Source Project 7222586f99 auto import from //branches/cupcake/...@132569 2009-02-20 07:38:31 -08:00
The Android Open Source Project d2bd26d326 auto import from //branches/cupcake/...@132276 2009-02-19 10:57:31 -08:00
Rebecca Schultz Zavin 288482b5a2 Add support for camera preview to be in overlay surfaces.
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2009-02-13 17:28:15 -08:00