Android (Google) Code Review
9b02d3f8b3
Merge change Ie46db339 into eclair-mr2
...
* changes:
Remove "unused" opcodes from API.
2009-12-04 11:20:54 -08:00
Android (Google) Code Review
bea276fa7f
Merge change I4261c58d into eclair-mr2
...
* changes:
Check if another Activity wants to intercept an xml mime type.
2009-12-04 11:08:28 -08:00
Romain Guy
fa97a2297a
am 48a65d99: Merge change I8c5f2fc3 into eclair
...
Merge commit '48a65d99cba33db3af2e05982a6825b883be2030' into eclair-mr2
* commit '48a65d99cba33db3af2e05982a6825b883be2030':
Fix invalidate code path (#2273209 ).
2009-12-04 10:37:59 -08:00
Android (Google) Code Review
5da9768e5c
Merge change I8c5f2fc3 into eclair
...
* changes:
Fix invalidate code path (#2273209 ).
2009-12-04 10:22:47 -08:00
Jim Miller
6931f6a7e1
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
5def0579f3
Merge change I8b63ab66 into eclair
...
* changes:
Better animation for sliding widget.
2009-12-03 22:14:19 -08:00
Android (Google) Code Review
8454336554
Merge change I6c84d731 into eclair-mr2
...
* changes:
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
2009-12-03 20:03:59 -08:00
Fred Quintana
61fdd3be55
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
97b51460d0
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
7e838f4ced
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
f60b136442
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
Android (Google) Code Review
f281db10d3
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
f5b4e6bab4
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
04710b1b3e
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
Android (Google) Code Review
8691e9ef19
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
6360ea394c
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
Erik Gilling
19b18d75fe
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
aa3255a32d
Merge change I00d0b54a into eclair
...
* changes:
surfaceflinger: remove un-cached buffer hack for SGX
2009-12-03 15:30:23 -08:00
Dianne Hackborn
8c7289f864
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
Erik Gilling
1bd48776eb
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
0f756526a7
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
04427e50a7
Merge change I74bf38a0 into eclair-mr2
...
* changes:
Squashed commit of the following:
2009-12-03 13:27:08 -08:00
San Mehat
de15958a13
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
Android (Google) Code Review
23ea02a42d
Merge change I20d77880 into eclair-mr2
...
* changes:
Make Gservices setting constants public.
2009-12-03 12:10:12 -08:00
Jaikumar Ganesh
c3a97de6ba
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
4f4aac4f0e
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
417fe604e9
Merge change I79420b02 into eclair
...
* changes:
Add support for Car Dock.
2009-12-03 11:49:38 -08:00
Android (Google) Code Review
438e014812
Merge change I33e0f00e into eclair
...
* changes:
docs: fix markup error in xml sample
2009-12-03 11:40:22 -08:00
Android (Google) Code Review
3b58525563
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
6dadfe46b1
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
e1e7196c0f
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
7cdf90390d
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
244d729805
Merge change Id5fa58cf into eclair
...
* changes:
Fix timezone issue to comply with EXIF standard.
2009-12-03 10:24:18 -08:00
Daniel Sandler
87043e06ce
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
Wu-cheng Li
3f6e728c57
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
Joe Onorato
5112d38bd6
am 19a4157c: Make the notification panel send the position as well.
...
Merge commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a' into eclair-mr2
* commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a':
Make the notification panel send the position as well.
2009-12-02 23:33:56 -08:00
Joe Onorato
01d0080fd1
am 7597065d: Make RemoteViews also set the sourceBounds in the PendingIntent.
...
Merge commit '7597065d6b0877ffc460b443fdb1595965ccd7b2' into eclair-mr2
* commit '7597065d6b0877ffc460b443fdb1595965ccd7b2':
Make RemoteViews also set the sourceBounds in the PendingIntent.
2009-12-02 23:16:11 -08:00
Joe Onorato
26882a628e
am c7a63eea: Add a new field to Intent that allows you to give a hint about what on screen caused the intent to be sent.
...
Merge commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640' into eclair-mr2
* commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
2009-12-02 22:40:57 -08:00
Android (Google) Code Review
bd396e8b0f
Merge change I51438c18 into eclair-mr2
...
* changes:
the vertex index should be "first + i".
2009-12-02 21:17:57 -08:00
Jack Veenstra
55403fe1b4
am de534329: Merge change Ica5efffe into eclair
...
Merge commit 'de5343290c4bac9b10b6fdd328b70da6f5e4d626' into eclair-mr2
* commit 'de5343290c4bac9b10b6fdd328b70da6f5e4d626':
Fix bug 2216426: correct the hdpi star assets for RatingBar.
2009-12-02 21:09:10 -08:00
Android (Google) Code Review
1a16327e47
Merge change Ica5efffe into eclair
...
* changes:
Fix bug 2216426: correct the hdpi star assets for RatingBar.
2009-12-02 21:01:20 -08:00
Dianne Hackborn
269bf92fad
am dcd58cfd: Merge change I7b9328c7 into eclair
...
Merge commit 'dcd58cfda366c915b1f0739cb115f9d972351c73' into eclair-mr2
* commit 'dcd58cfda366c915b1f0739cb115f9d972351c73':
Fix issue #2300232 : Bugs in resolving conflicting pointers
2009-12-02 18:56:20 -08:00
Android (Google) Code Review
a584cbe32f
Merge change I7b9328c7 into eclair
...
* changes:
Fix issue #2300232 : Bugs in resolving conflicting pointers
2009-12-02 18:51:19 -08:00
Omari Stephens
ef67e0dd0e
am 7dfecb86: Merge change Iaa6e73a6 into eclair
...
Merge commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54' into eclair-mr2
* commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54':
Revive backup tests
2009-12-02 18:26:05 -08:00
Android (Google) Code Review
0c285c1294
Merge change Iaa6e73a6 into eclair
...
* changes:
Revive backup tests
2009-12-02 18:21:49 -08:00
Android (Google) Code Review
948b9e6f14
Merge change I8179742a into eclair-mr2
...
* changes:
Add support for extracting render time and image in page cycler
2009-12-02 18:04:23 -08:00
Android (Google) Code Review
b0cc59cdf7
Merge change I611c15cf into eclair-mr2
...
* changes:
Add DoCoMo vendor specific OMNA WSP content type number Import CL 145261 from //branches/cupcake_dcm
2009-12-02 17:56:20 -08:00
Android (Google) Code Review
9322313e6b
Merge change Icae1a990 into eclair-mr2
...
* changes:
Adding NAME_RAW_CONTACT_ID column to Contacts.
2009-12-02 17:55:39 -08:00
Mathias Agopian
fd70b7f335
am 121a31ac: Merge change Id86beb99 into eclair
...
Merge commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c' into eclair-mr2
* commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c':
fix [2291418] Camera preview cannot work in Emulator
2009-12-02 17:50:45 -08:00
Android (Google) Code Review
91e4152760
Merge change Id86beb99 into eclair
...
* changes:
fix [2291418] Camera preview cannot work in Emulator
2009-12-02 17:09:46 -08:00