Suchi Amalapurapu
058e763e38
Merge "Add four way directional rotation to WindowOrientationListener"
2010-01-04 15:07:14 -08:00
Andreas Huber
24510520aa
Merge "Fix avc software decoder to properly handle SEI nalType and access unit delimiter."
2010-01-04 15:04:08 -08:00
Romain Guy
ad87c87e81
Merge "Plug memory leak in Simple*Adapter, due to the misuse of a WeakHashMap. This removes an optimization but the benefit is not worth the memory leak. Bug: #2353474."
2010-01-04 14:54:02 -08:00
Romain Guy
a221f4cb7f
Merge "Fix typo in ColorStateList documentation."
2010-01-04 14:46:28 -08:00
Romain Guy
aeb3bbb8e5
Merge "Do not start filtering if the first character is a space. Bug: #2347833."
2010-01-04 14:34:55 -08:00
Marco Nelissen
4dc2e8c110
Merge "Add the UNKNOWN_STRING definition to MediaStore. It will be removed from MediaFile once I've updated the code that uses it."
2010-01-04 14:02:49 -08:00
Ying Wang
e01504a55c
am 5c529a0c: am 08fa1428: Rename ro.monkey to monkey.running
...
Merge commit '5c529a0cb587d0dfa38e5642e268ca56285a356f'
* commit '5c529a0cb587d0dfa38e5642e268ca56285a356f':
Rename ro.monkey to monkey.running
2010-01-04 13:49:47 -08:00
Ying Wang
8a7567f32d
am 08fa1428: Rename ro.monkey to monkey.running
...
Merge commit '08fa1428eed52083789dc3b366aea4873199bd37' into eclair-plus-aosp
* commit '08fa1428eed52083789dc3b366aea4873199bd37':
Rename ro.monkey to monkey.running
2010-01-04 12:59:17 -08:00
Nicolas Roard
e4ae0266bc
am 081798f9: am 38863336: layers support
...
Merge commit '081798f91270adb2a68979e5f7867d2021b8eed3'
* commit '081798f91270adb2a68979e5f7867d2021b8eed3':
layers support
2010-01-04 12:49:50 -08:00
Nicolas Roard
c85e7090ea
am 38863336: layers support
...
Merge commit '3886333644467beeaf60c13fb94f242538067765' into eclair-mr2-plus-aosp
* commit '3886333644467beeaf60c13fb94f242538067765':
layers support
2010-01-04 11:42:41 -08:00
Romain Guy
f988157549
Merge "Fix obsolete advice in RelativeLayout's documentation."
2010-01-04 10:58:13 -08:00
Marco Nelissen
c59ad227eb
Merge "Don't round size to page size. Ashmem will do this internally as needed."
2010-01-04 10:31:28 -08:00
Grace Kloba
3474f01c34
am 8d562f78: am bc7afcb9: Merge "free the NPObject in NPP_Destroy." into eclair-mr2
...
Merge commit '8d562f78b4919babe1f7e32e974e5057dcfbb310'
* commit '8d562f78b4919babe1f7e32e974e5057dcfbb310':
free the NPObject in NPP_Destroy.
2010-01-04 10:05:21 -08:00
Grace Kloba
441eb397da
am 9002eb44: am 67166b6e: Merge "Cleanup the cache file when we decide not saving it. This logic was lost when we switched back using FLASH instead of RAM for the cache." into eclair-mr2
...
Merge commit '9002eb44043868a2f5fc38128748464492f297c6'
* commit '9002eb44043868a2f5fc38128748464492f297c6':
Cleanup the cache file when we decide not saving it.
2010-01-04 10:05:13 -08:00
Grace Kloba
e4299d355b
am bc7afcb9: Merge "free the NPObject in NPP_Destroy." into eclair-mr2
...
Merge commit 'bc7afcb94688dedb0ae9b4b3415f46aa13e713e5' into eclair-mr2-plus-aosp
* commit 'bc7afcb94688dedb0ae9b4b3415f46aa13e713e5':
free the NPObject in NPP_Destroy.
2010-01-04 10:01:24 -08:00
Grace Kloba
7377cf4ad4
am 67166b6e: Merge "Cleanup the cache file when we decide not saving it. This logic was lost when we switched back using FLASH instead of RAM for the cache." into eclair-mr2
...
Merge commit '67166b6eaea7a3bc83ec7bf2876b3807cda859f1' into eclair-mr2-plus-aosp
* commit '67166b6eaea7a3bc83ec7bf2876b3807cda859f1':
Cleanup the cache file when we decide not saving it.
2010-01-04 10:01:16 -08:00
Grace Kloba
fe990768e5
Merge "free the NPObject in NPP_Destroy." into eclair-mr2
2010-01-04 09:56:46 -08:00
Grace Kloba
efb97778fd
Merge "Cleanup the cache file when we decide not saving it. This logic was lost when we switched back using FLASH instead of RAM for the cache." into eclair-mr2
2010-01-04 09:55:54 -08:00
Dave Sparks
0782997ca0
Merge "Remove some logging from camera operations. Bug 2346606."
2010-01-04 08:57:20 -08:00
Dave Sparks
e7e93f9326
Remove some logging from camera operations. Bug 2346606.
2010-01-04 08:55:04 -08:00
Leon Scroggins
30cd8c2ea8
am 1b9d7605: am e26efa32: If the DOM changes textfield focus, make the IME work properly.
...
Merge commit '1b9d7605df3c07998752b713d7f944bb925cb193'
* commit '1b9d7605df3c07998752b713d7f944bb925cb193':
If the DOM changes textfield focus, make the IME work properly.
2010-01-04 08:02:18 -08:00
Leon Scroggins
14bb29e901
am e26efa32: If the DOM changes textfield focus, make the IME work properly.
...
Merge commit 'e26efa321c66716d58f3e338022caed8852af07e' into eclair-mr2-plus-aosp
* commit 'e26efa321c66716d58f3e338022caed8852af07e':
If the DOM changes textfield focus, make the IME work properly.
2010-01-04 07:32:59 -08:00
Jack Palevich
01cc538b29
A library for encoding and decoding ETC1 textures.
...
The ETC1 compressed texture format is commonly
supported by OpenGL ES 2.0-capable devices.
2009-12-31 13:31:04 +08:00
Chia-chi Yeh
ce64d9f50f
Merge "keystore: compute the padding in an intuitive way."
2009-12-29 21:36:43 -08:00
Charles Chen
f028eaa35b
am 014085a8: am 4bc95d19: Merge change Iab089078 into eclair-mr2
...
Merge commit '014085a8727d7e10a4d39cba4a6d27826b66bc00'
* commit '014085a8727d7e10a4d39cba4a6d27826b66bc00':
Fix for a race condition that can occur if an utterance
2009-12-29 20:11:10 -08:00
Tom Taylor
71f1faccee
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base
2009-12-29 20:11:00 -08:00
Chia-chi Yeh
b78679e18d
keystore: compute the padding in an intuitive way.
2009-12-30 10:38:39 +08:00
Android (Google) Code Review
d6f86eefe1
Merge change Idbe64967
...
* changes:
Fix a typo.
2009-12-29 13:28:05 -08:00
Eric Laurent
ce82a44fd1
am 68e9014e: am 484d2888: Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
...
Merge commit '68e9014e47f7350b3889e1704dde809b2a926968'
* commit '68e9014e47f7350b3889e1704dde809b2a926968':
Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
2009-12-27 16:33:17 -08:00
Android (Google) Code Review
c4d2f0b697
Merge change I92a824fe
...
* changes:
Immediately close the shade when the status bar is disabled.
2009-12-26 20:39:44 -08:00
Android (Google) Code Review
ecafff1702
Merge change I1c875584
...
* changes:
Print OpenGL version and extension information.
2009-12-23 19:12:49 -08:00
Jack Palevich
909486a7cb
Print OpenGL version and extension information.
...
Something happened to the line endings, adding
a blank line after most lines of text. I
repaired the damage, but in the process some
blank lines have been added / removed.
2009-12-24 11:09:56 +08:00
Android (Google) Code Review
872db948a0
Merge change I14b9785e
...
* changes:
Fix SoundPool restart problem CheckJNI issue.
2009-12-23 17:26:40 -08:00
Android (Google) Code Review
dd89eee7fc
Merge change I0fa1b245
...
* changes:
telephony: Populate the User-to-user signaling info fields.
2009-12-23 16:48:20 -08:00
Android (Google) Code Review
973f588343
Merge change I7d46f612
...
* changes:
Disable excessive RS logging.
2009-12-23 14:57:08 -08:00
Android (Google) Code Review
f7c5775508
Merge change I718cd1f3
...
* changes:
Element restructuring. Add support for new basic Element types including the RS objects and vectors(2-4). In theory this paves the way for maintaining type info for RS objects, passing elements for GLSL uiforms/attribs/varyings, and supporting nested structures.
2009-12-23 14:55:24 -08:00
Android (Google) Code Review
38acdb07c8
Merge change Idfa47b56
...
* changes:
Don't crash the system process when a backup transport unregisters
2009-12-23 11:40:14 -08:00
Android (Google) Code Review
d23485c288
Merge change I9120be33
...
* changes:
Add OnLoadCompleteListener to SoundPool.
2009-12-23 09:45:23 -08:00
Eric Laurent
d0553bf97e
am f31f365a: am eb5ffc23: Merge change Id8e98194 into eclair
...
Merge commit 'f31f365a7708c931e955670bc6213fdc8f91a87a'
* commit 'f31f365a7708c931e955670bc6213fdc8f91a87a':
Fix issues 2333450 and 2333559:
2009-12-22 23:46:16 -08:00
Eric Laurent
82db677f42
am eb5ffc23: Merge change Id8e98194 into eclair
...
Merge commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c' into eclair-plus-aosp
* commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c':
Fix issues 2333450 and 2333559:
2009-12-22 23:41:59 -08:00
Android (Google) Code Review
3b42b7e746
Merge change Id8e98194 into eclair
...
* changes:
Fix issues 2333450 and 2333559:
2009-12-22 23:34:22 -08:00
Jack Palevich
4405c6a555
am 244cc72f: am e3449553: Merge change I49c9a3a3 into eclair
...
Merge commit '244cc72fdf906799e3ec4cfe5b7cda49d9f08cca'
* commit '244cc72fdf906799e3ec4cfe5b7cda49d9f08cca':
Fix bug 2325244 screen turns black for a brief period of time
2009-12-22 18:35:26 -08:00
Jack Palevich
f8481346c8
am e3449553: Merge change I49c9a3a3 into eclair
...
Merge commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e' into eclair-plus-aosp
* commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e':
Fix bug 2325244 screen turns black for a brief period of time
2009-12-22 18:31:58 -08:00
Android (Google) Code Review
0f0cdb40ab
Merge change I49c9a3a3 into eclair
...
* changes:
Fix bug 2325244 screen turns black for a brief period of time
2009-12-22 18:29:29 -08:00
Charles Chen
4d10a98008
am 4bc95d19: Merge change Iab089078 into eclair-mr2
...
Merge commit '4bc95d19c9ccf9cfe4c51b1e697db8cc1d86a579' into eclair-mr2-plus-aosp
* commit '4bc95d19c9ccf9cfe4c51b1e697db8cc1d86a579':
Fix for a race condition that can occur if an utterance
2009-12-22 17:42:25 -08:00
Eric Laurent
1c6d5ecde6
am 484d2888: Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
...
Merge commit '484d2888680e18e6ad8c3fcc51e3b70a705a096e' into eclair-mr2-plus-aosp
* commit '484d2888680e18e6ad8c3fcc51e3b70a705a096e':
Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
2009-12-22 17:42:17 -08:00
Android (Google) Code Review
13fc5a45d9
Merge change Iab089078 into eclair-mr2
...
* changes:
Fix for a race condition that can occur if an utterance is stopped right when it completes.
2009-12-22 17:39:57 -08:00
Android (Google) Code Review
0765fae66f
Merge change I5038c78f
...
* changes:
Add missing shared libraries in linker commands. Currently these libraries are linked implicitly via dependencies of other shared libraries.
2009-12-22 17:12:03 -08:00
Android (Google) Code Review
8634a31b49
Merge change Ia834022d
...
* changes:
Convert DataConnection to an HSM and rename PdpConnection to GsmDataConnection.
2009-12-22 15:43:15 -08:00
Android (Google) Code Review
eec126bb1d
Merge change Ib9285359
...
* changes:
Add bugreport info about network feature use.
2009-12-22 10:51:51 -08:00