16671 Commits

Author SHA1 Message Date
Erik Pasternak
176735c703 Merge "b/2293263 Replaced busybit functionality with eventDay functionality." 2010-01-04 18:43:39 -08:00
Jason Sams
225ef52bd6 Merge "Add RS support for generic attribs as input to vertex programs." 2010-01-04 16:53:42 -08:00
Jason Sams
e17964e150 Add RS support for generic attribs as input to vertex programs. 2010-01-04 16:52:27 -08:00
Erik
3763464e8f b/2293263 Replaced busybit functionality with eventDay functionality.
Made changes to start stripping out busybits and replace them with checks only to see if an event eists on a given day.
This file ties into several other areas so not all busybits references were removed and those that were have been
commented out to make it easier to find errors.
2010-01-04 16:29:15 -08:00
Suchi Amalapurapu
d9328513da Turn off debug flag 2010-01-04 16:18:06 -08:00
Romain Guy
1dabb95d28 Merge "Ignore key events when the widget is disabled. Bug: #2353635." 2010-01-04 15:40:27 -08:00
Android Git Automerger
d5c19608c6 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2010-01-04 15:39:56 -08:00
Romain Guy
992cc4282e Ignore key events when the widget is disabled.
Bug: #2353635.
2010-01-04 15:39:40 -08:00
Marco Nelissen
7eca501433 Merge "MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING" 2010-01-04 15:10:33 -08:00
Marco Nelissen
9a488b44cb MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING 2010-01-04 15:09:03 -08:00
Andreas Huber
1a08ad1cae Merge "Make metadata support through stagefright property dependent until it's ready." 2010-01-04 15:08:32 -08:00
Andreas Huber
c4273482e0 Merge "Fix mpeg4/h.263 software decoder." 2010-01-04 15:07:36 -08:00
Suchi Amalapurapu
40967d61fc Merge "Add four way directional rotation to WindowOrientationListener" 2010-01-04 15:07:14 -08:00
Suchi Amalapurapu
63104edbf0 Add four way directional rotation to WindowOrientationListener 2010-01-04 15:05:20 -08:00
Andreas Huber
0d7da000cb Merge "Fix avc software decoder to properly handle SEI nalType and access unit delimiter." 2010-01-04 15:04:08 -08:00
Andreas Huber
7782fdf5b7 Make metadata support through stagefright property dependent until it's ready. 2010-01-04 15:02:02 -08:00
Romain Guy
7d3cbfe2db 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
c8ca2a3a07 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:52:38 -08:00
Andreas Huber
2039bd93ed Fix mpeg4/h.263 software decoder. 2010-01-04 14:51:49 -08:00
Andreas Huber
6be8b14e25 Fix avc software decoder to properly handle SEI nalType and access unit delimiter. 2010-01-04 14:51:01 -08:00
Romain Guy
4cb8b8ffdf Merge "Fix typo in ColorStateList documentation." 2010-01-04 14:46:28 -08:00
Romain Guy
79dc8ccddd Fix typo in ColorStateList documentation. 2010-01-04 14:45:49 -08:00
Romain Guy
1c2d1d0296 Merge "Do not start filtering if the first character is a space. Bug: #2347833." 2010-01-04 14:34:55 -08:00
Romain Guy
cf6c5720a7 Do not start filtering if the first character is a space.
Bug: #2347833.
2010-01-04 14:34:08 -08:00
Marco Nelissen
f9f4173c7d 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
24c10062cd 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
Marco Nelissen
ed297a8417 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 13:24:31 -08:00
Ying Wang
5c529a0cb5 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
0804043689 am 081798f9: am 38863336: layers support
Merge commit '081798f91270adb2a68979e5f7867d2021b8eed3'

* commit '081798f91270adb2a68979e5f7867d2021b8eed3':
  layers support
2010-01-04 12:49:50 -08:00
Ying Wang
08fa1428ee Rename ro.monkey to monkey.running
So that Monkey can set ro.mokey before running and reset it after running.
2010-01-04 11:56:24 -08:00
Nicolas Roard
081798f912 am 38863336: layers support
Merge commit '3886333644467beeaf60c13fb94f242538067765' into eclair-mr2-plus-aosp

* commit '3886333644467beeaf60c13fb94f242538067765':
  layers support
2010-01-04 11:42:41 -08:00
Nicolas Roard
3886333644 layers support 2010-01-04 19:30:55 +00:00
Dan Egnor
1337b012f8 Fix DropBox reference in SDK comment. (Fix SDK build.) 2010-01-04 11:02:00 -08:00
Romain Guy
f1d068981b Merge "Fix obsolete advice in RelativeLayout's documentation." 2010-01-04 10:58:13 -08:00
Romain Guy
520c4204fb Fix obsolete advice in RelativeLayout's documentation. 2010-01-04 10:56:38 -08:00
Marco Nelissen
e80a066984 Merge "Don't round size to page size. Ashmem will do this internally as needed." 2010-01-04 10:31:28 -08:00
Dan Egnor
e38d58bf89 Remove Google-specific (or only-used-by-Google-code) classes.
Fix a small typo in Context javadoc.
2010-01-04 10:14:21 -08:00
Grace Kloba
2c3058a88f 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
c70cf9af8d 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
8d562f78b4 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
9002eb4404 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
bc7afcb946 Merge "free the NPObject in NPP_Destroy." into eclair-mr2 2010-01-04 09:56:46 -08:00
Grace Kloba
67166b6eae 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
Marco Nelissen
7bcbd51173 Don't round size to page size. Ashmem will do this internally as needed. 2010-01-04 09:54:45 -08:00
Dave Sparks
3bf657a22b Merge "Remove some logging from camera operations. Bug 2346606." 2010-01-04 08:57:20 -08:00
Dave Sparks
c95a176d6f Remove some logging from camera operations. Bug 2346606. 2010-01-04 08:55:04 -08:00
Leon Scroggins
87232e6382 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
1b9d7605df 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
Leon Scroggins
e26efa321c If the DOM changes textfield focus, make the IME work properly.
Fix for http://b/issue?id=2219166

Requires a change to external/webkit

Remove the old change to update the WebTextView when a key is pressed,
since the IME does not generate key events.  Instead, when the focus
changes, and the IME is serving the WebTextView, immediately clear
the cursor and update the WebTextView, so the user can continue
typing.
2010-01-04 09:43:57 -05:00
San Mehat
7fd0fee968 services: MountService: Refactor MountService for vold2
Squash of the following:
services: MountService: Rework the way volume states are handled
MountService: Add new API for directly getting volume state via a mount point
Environment: Switch from using system property for external storage state.
MountService: Add support for UMS
MountService: Fix a few bugs
services: MountService: Add support for mount-on-insertion
services: MountService: Add some debugging around UMS
services: MountService: Fix some UMS bugs and clean-up startup mount code

Signed-off-by: San Mehat <san@google.com>
2010-01-02 07:24:07 -08:00