Jim Miller
3077f7df2e
am 1296d562: Merge change I8b63ab66 into eclair
...
Merge commit '1296d562cf9b80e439724e15b4fdaf6626d2b4df' into eclair-mr2
* commit '1296d562cf9b80e439724e15b4fdaf6626d2b4df':
Better animation for sliding widget.
2009-12-03 22:18:24 -08:00
Android (Google) Code Review
1296d562cf
Merge change I8b63ab66 into eclair
...
* changes:
Better animation for sliding widget.
2009-12-03 22:14:19 -08:00
Android (Google) Code Review
104d3f755e
Merge change I6c84d731 into eclair-mr2
...
* changes:
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
2009-12-03 20:03:59 -08:00
Dianne Hackborn
39b0823568
Add API level 8, currently a copy of 7.
2009-12-03 17:25:10 -08:00
Fred Quintana
298de218c5
am 0ce8431c: Merge change Iaa7edda4 into eclair
...
Merge commit '0ce8431c15078e095a22a123dbabcd91049a9652' into eclair-mr2
* commit '0ce8431c15078e095a22a123dbabcd91049a9652':
don't reschedule syncs that failed with a tooManyRetries error
2009-12-03 17:17:00 -08:00
Android (Google) Code Review
0ce8431c15
Merge change Iaa7edda4 into eclair
...
* changes:
don't reschedule syncs that failed with a tooManyRetries error
2009-12-03 17:10:59 -08:00
Android (Google) Code Review
2a428fd463
Merge change I85e5d39e into eclair-mr2
...
* changes:
Two more uses of strlcpy that break the sim build. Now fixed.
2009-12-03 16:27:16 -08:00
Jason Sams
9737dc4de2
am 5c49a908: (-s ours) Merge change Ic73ec39b into eclair
...
Merge commit '5c49a9080df9e46193efa8326318c86bc8976eea' into eclair-mr2
* commit '5c49a9080df9e46193efa8326318c86bc8976eea':
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.
2009-12-03 16:23:23 -08:00
Andreas Huber
85e5d39e60
Two more uses of strlcpy that break the sim build. Now fixed.
2009-12-03 16:22:52 -08:00
Android (Google) Code Review
5c49a9080d
Merge change Ic73ec39b into eclair
...
* changes:
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.
2009-12-03 16:15:46 -08:00
Scott Main
9f0fa1f4c1
Merge branch 'eclair-mr2' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2
2009-12-03 16:14:13 -08:00
Scott Main
e08361d7fd
am 5d0806c9: Merge change Ia70bd8c4 into eclair
...
Merge commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6' into eclair-mr2
* commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6':
add BluetoothChat sample app to the dev guide
2009-12-03 16:13:19 -08:00
Andreas Huber
805cc709b7
Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
2009-12-03 16:07:05 -08:00
Android (Google) Code Review
5d0806c9c3
Merge change Ia70bd8c4 into eclair
...
* changes:
add BluetoothChat sample app to the dev guide
2009-12-03 16:06:52 -08:00
Android (Google) Code Review
8d670d3458
Merge change I1f1c7bad into eclair-mr2
...
* changes:
I accidentally broke this code while refactoring MediaScanner. This is the fix.
2009-12-03 15:51:09 -08:00
Andreas Huber
1f1c7bad42
I accidentally broke this code while refactoring MediaScanner. This is the fix.
2009-12-03 15:45:53 -08:00
Jason Sams
c73ec39bd0
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.
2009-12-03 15:43:18 -08:00
Scott Main
14a704295f
add BluetoothChat sample app to the dev guide
2009-12-03 15:42:50 -08:00
Erik Gilling
9b565d5bf3
am cef8d031: Merge change I00d0b54a into eclair
...
Merge commit 'cef8d031e842b773bbd6481b517996a185391e92' into eclair-mr2
* commit 'cef8d031e842b773bbd6481b517996a185391e92':
surfaceflinger: remove un-cached buffer hack for SGX
2009-12-03 15:35:55 -08:00
Android (Google) Code Review
cef8d031e8
Merge change I00d0b54a into eclair
...
* changes:
surfaceflinger: remove un-cached buffer hack for SGX
2009-12-03 15:30:23 -08:00
Dianne Hackborn
eefe7b1b3e
am b2e49a23: Add API level 7.
...
Merge commit 'b2e49a2319a40976a60d51d9a7c55d20f0b2d0e9' into eclair-mr2
* commit 'b2e49a2319a40976a60d51d9a7c55d20f0b2d0e9':
Add API level 7.
2009-12-03 14:52:46 -08:00
Fred Quintana
aa7edda471
don't reschedule syncs that failed with a tooManyRetries error
2009-12-03 14:18:58 -08:00
Dianne Hackborn
b2e49a2319
Add API level 7.
...
Change-Id: Id87dc724f0758ce0faee9c00621d4af6cb9f5bd9
2009-12-03 14:13:53 -08:00
Erik Gilling
00d0b54af1
surfaceflinger: remove un-cached buffer hack for SGX
...
Signed-off-by: Erik Gilling <konkers@android.com >
2009-12-03 14:09:31 -08:00
Android (Google) Code Review
67d9aa15b6
Merge change I6173d7c7 into eclair-mr2
...
* changes:
Add isPrintableAscii() and isPrintableAsciiOnly() to TextUtils.java as hidden methods, and make vCard code use them.
2009-12-03 13:55:07 -08:00
Android (Google) Code Review
2d6d609c9e
Merge change I74bf38a0 into eclair-mr2
...
* changes:
Squashed commit of the following:
2009-12-03 13:27:08 -08:00
Andreas Huber
bfb9fb143b
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
2009-12-03 13:21:54 -08:00
Andreas Huber
b0caf946b7
Squashed commit of the following:
...
commit 543e192bf2ae13f573dc4c4e53b239ed4ea00e81
Author: Andreas Huber <andih@google.com >
Date: Thu Dec 3 11:33:57 2009 -0800
stagefright now acts as the OMX Master, vendors supply their own plugins through libstagefrighthw. In OpenCore-enabled builds we now sit on top of PVMaster...
commit 3cbfdbd9cecadbb77b63125c62883bf1065884fe
Author: Andreas Huber <andih@google.com >
Date: Wed Dec 2 12:39:07 2009 -0800
More OMX infrastructure, stagefright is now taking over the OMX Master, multiplexing all contributing OMX implementations under a common interface.
2009-12-03 12:49:09 -08:00
San Mehat
d345c6aced
am 0a42b811: base: process: Abort setting the process group if one of the threads fails to switch
...
Merge commit '0a42b811aea490a9a605b75f0320101f6eafd283' into eclair-mr2
* commit '0a42b811aea490a9a605b75f0320101f6eafd283':
base: process: Abort setting the process group if one of the threads fails to switch
2009-12-03 12:45:59 -08:00
San Mehat
0a42b811ae
base: process: Abort setting the process group if one of the threads fails to switch
...
Signed-off-by: San Mehat <san@google.com >
2009-12-03 12:23:00 -08:00
Naveen Kalla
6c84d7313e
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
...
Tone format for TONE_CDMA_ANSWER should be 660Hz + 1000Hz, with a 500ms ON
duration.
2009-12-03 12:17:18 -08:00
Android (Google) Code Review
4850b5cd74
Merge change I20d77880 into eclair-mr2
...
* changes:
Make Gservices setting constants public.
2009-12-03 12:10:12 -08:00
Jaikumar Ganesh
11a2853e01
am 8c411fb1: Merge change I79420b02 into eclair
...
Merge commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338' into eclair-mr2
* commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338':
Add support for Car Dock.
2009-12-03 12:01:38 -08:00
Scott Main
7f1ab539ce
am 90d311ff: Merge change I33e0f00e into eclair
...
Merge commit '90d311ff33f33024f642ef03a02fb62566c9f46b' into eclair-mr2
* commit '90d311ff33f33024f642ef03a02fb62566c9f46b':
docs: fix markup error in xml sample
2009-12-03 11:54:43 -08:00
Android (Google) Code Review
8c411fb139
Merge change I79420b02 into eclair
...
* changes:
Add support for Car Dock.
2009-12-03 11:49:38 -08:00
Android (Google) Code Review
90d311ff33
Merge change I33e0f00e into eclair
...
* changes:
docs: fix markup error in xml sample
2009-12-03 11:40:22 -08:00
Jaikumar Ganesh
3fbf7b62bb
Add support for Car Dock.
...
Dr No: Eastham
Bug: 2133530
2009-12-03 11:35:37 -08:00
Scott Main
33e0f00e95
docs: fix markup error in xml sample
2009-12-03 11:33:25 -08:00
Android (Google) Code Review
7c09a0ff36
Merge change Ib904c2a4 into eclair-mr2
...
* changes:
Remove old hack A/V sync hack that is no longer needed.
2009-12-03 11:25:54 -08:00
Mike Lockwood
44000eb2a2
am 678c2e35: Merge change I9ef88863 into eclair
...
Merge commit '678c2e35768a5426b4ad8f67c836008e7751a353' into eclair-mr2
* commit '678c2e35768a5426b4ad8f67c836008e7751a353':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
2009-12-03 11:18:48 -08:00
Android (Google) Code Review
678c2e3576
Merge change I9ef88863 into eclair
...
* changes:
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
2009-12-03 10:59:25 -08:00
Ray Chen
1b794bbbdc
am e12de4d5: Merge change Id5fa58cf into eclair
...
Merge commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1' into eclair-mr2
* commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1':
Fix timezone issue to comply with EXIF standard.
2009-12-03 10:35:45 -08:00
Android (Google) Code Review
e12de4d504
Merge change Id5fa58cf into eclair
...
* changes:
Fix timezone issue to comply with EXIF standard.
2009-12-03 10:24:18 -08:00
Dave Sparks
b904c2a452
Remove old hack A/V sync hack that is no longer needed.
2009-12-03 10:13:32 -08:00
Vasu Nori
6d1ec0d81c
dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj.
...
dealloc compiled-sql statements before removing references of SQLiteClosable objects from SQLiteDatabase obj. otherwise, code will attempt to close database before deallocing the compiled-sql statements and that causes sqlite exceptions.
2009-12-03 10:01:20 -08:00
Daniel Sandler
add867197c
am 14bee131: Fix lock screen layouts with emergency call buttons.
...
Merge commit '14bee131da68404b33655a241de83c2eeb417559' into eclair-mr2
* commit '14bee131da68404b33655a241de83c2eeb417559':
Fix lock screen layouts with emergency call buttons.
2009-12-03 08:42:34 -08:00
Daniel Sandler
14bee131da
Fix lock screen layouts with emergency call buttons.
...
Fixes http://b/2259529
Partially fixes http://b/2260798
Change-Id: Iabb3f74dc2a331810ae8ff44ebb319fe25d217ef
2009-12-03 11:00:38 -05:00
Mike Lockwood
435eb6464c
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
...
Part of a fix for bug b/2300622 (Proximity sensor always blows up the lock screen while in call)
Change-Id: I9ef888638b19540a78a34507d52ff522f505102f
Signed-off-by: Mike Lockwood <lockwood@android.com >
2009-12-03 08:56:53 -05:00
Wu-cheng Li
64fc80823e
am 40057ce7: Document that stopPreview is not needed before takePicture.
...
Merge commit '40057ce749c8c4d274db0352a2af4344bda92dba' into eclair-mr2
* commit '40057ce749c8c4d274db0352a2af4344bda92dba':
Document that stopPreview is not needed before takePicture.
2009-12-03 00:16:35 -08:00
Wu-cheng Li
40057ce749
Document that stopPreview is not needed before takePicture.
...
Also, applications can call startPreview after jpeg callback is received.
http://b/2292461
2009-12-03 16:10:08 +08:00