Dima Zavin
0fe8a9bc4b
am 0019215f: Revert "When using MDP, we needed to use a texture for diming."
...
Merge commit '0019215fc395ef12c191049b1903eeabf70859cf' into eclair-mr2
* commit '0019215fc395ef12c191049b1903eeabf70859cf':
Revert "When using MDP, we needed to use a texture for diming."
2009-12-07 01:36:26 -08:00
Dima Zavin
a9ec9be195
Revert "When using MDP, we needed to use a texture for diming."
...
This reverts commit bf0c320afbf6bf2441916755ecb443b64afbe73f.
2009-12-07 00:17:06 -08:00
Android (Google) Code Review
65deb8dbec
Merge change I9589f9c2 into eclair-mr2
...
* changes:
Move android.server.search.SearchableInfo to android.app
2009-12-05 10:21:01 -08:00
Android (Google) Code Review
0053961c4c
Merge change I4039545e into eclair-mr2
...
* changes:
Fire OnGroupClick events when collapsing a group in ExpandableListView.
2009-12-04 17:01:54 -08:00
Android (Google) Code Review
a342a772b4
Merge change I5f1d2d24 into eclair-mr2
...
* changes:
move event log tags used by ActivityManager into this package
2009-12-04 16:46:28 -08:00
Android (Google) Code Review
4bb1dca1d2
Merge change I88721afe into eclair-mr2
...
* changes:
Fix bitmask in aapt's StringPool length construction
2009-12-04 15:59:59 -08:00
Android (Google) Code Review
3a74b53875
Merge changes Id682ab72,I9bb4dbae into eclair-mr2
...
* changes:
Improve error message thrown when eglCreateContext fails.
Improve error reporting by always returning the public EGL10.EGL_NO_XXX objects for displays, surfaces, and contexts.
2009-12-04 15:55:47 -08:00
Android (Google) Code Review
78b31fdc28
Merge change If3c7d429 into eclair-mr2
...
* changes:
Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
2009-12-04 15:50:43 -08:00
Android (Google) Code Review
dc4a713595
Merge change Iaad9c8d1 into eclair-mr2
...
* changes:
Restore 7.xml.
2009-12-04 15:39:59 -08:00
Suchi Amalapurapu
4beb266b71
am ae952b3b: Merge change Ibe1c422a into eclair
...
Merge commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7' into eclair-mr2
* commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7':
If the usage stats file doesn't exist in the first place there is no need to
2009-12-04 15:01:49 -08:00
Android (Google) Code Review
d313000d3a
Merge change Ibe1c422a into eclair
...
* changes:
If the usage stats file doesn't exist in the first place there is no need to backup and short return.
2009-12-04 14:59:43 -08:00
Android (Google) Code Review
04de25cee8
Merge change Ifef6435a into eclair-mr2
...
* changes:
Enable proper cleanup of OMX nodes managed through stagefright.
2009-12-04 13:36:57 -08:00
Christopher Tate
dbababeb86
am d3bc1994: Merge change I397b6a93 into eclair
...
Merge commit 'd3bc1994b0c2c5e9c60fa748de47eebbe1984fda' into eclair-mr2
* commit 'd3bc1994b0c2c5e9c60fa748de47eebbe1984fda':
Don't accidentally signal multiple exceptions in setThreadPriority()
2009-12-04 12:54:36 -08:00
Android (Google) Code Review
bc8764ae77
Merge change I397b6a93 into eclair
...
* changes:
Don't accidentally signal multiple exceptions in setThreadPriority()
2009-12-04 12:51:44 -08:00
Android (Google) Code Review
888b9c96ea
Merge change Iab5c49c7 into eclair-mr2
...
* changes:
move event log tags used by system server into this package
2009-12-04 12:00:13 -08:00
Ray Chen
ac28190e34
am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371
...
Merge commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644' into eclair-mr2
* commit '052d9c8b414dc9eb1c70d849660592d9bc3b2644':
Images.Media.DATE_TAKEN should be in milliseconds.
2009-12-04 11:57:10 -08:00
Android (Google) Code Review
9eeee88759
Merge change If32b488b into eclair-mr2
...
* changes:
Add new unit test for RadioGroup/RadioButton.
2009-12-04 11:51:05 -08:00
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