Commit Graph

4510 Commits

Author SHA1 Message Date
Yu Shan Emily Lau
cac9149c06 am bde54df0: modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the incorrect expected druation
Merge commit 'bde54df0209e6b3db720b14f5c7b8bd6e6372757' into eclair-plus-aosp

* commit 'bde54df0209e6b3db720b14f5c7b8bd6e6372757':
  modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
2009-09-08 19:03:35 -07:00
Fred Quintana
997f4911e5 am b0dccf73: Merge change 24012 into eclair
Merge commit 'b0dccf73ddb5a695fe24f1435411feea5876609f' into eclair-plus-aosp

* commit 'b0dccf73ddb5a695fe24f1435411feea5876609f':
  add a transaction monitor
2009-09-08 17:29:09 -07:00
Android (Google) Code Review
ac6dda883e Merge change 24012 into eclair
* changes:
  add a transaction monitor
2009-09-08 17:26:25 -07:00
Eric Fischer
3c0a492208 am 046263ce: Merge change 24220 into eclair
Merge commit '046263ce352912990e492eb5cfd833c21109cf9f' into eclair-plus-aosp

* commit '046263ce352912990e492eb5cfd833c21109cf9f':
  Import revised translations.  DO NOT MERGE
2009-09-08 17:01:11 -07:00
Android (Google) Code Review
d55f91d45a Merge change 24220 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-09-08 16:58:33 -07:00
Yu Shan Emily Lau
6d4a6286a3 am 9bb1101f: Merge change 23924 into eclair
Merge commit '9bb1101f5ccd795265dff1cfa4bb73998ba807ba' into eclair-plus-aosp

* commit '9bb1101f5ccd795265dff1cfa4bb73998ba807ba':
  new file:   LowStorageTest/Android.mk
2009-09-08 16:33:05 -07:00
Android (Google) Code Review
0f8fb9be9c Merge change 23924 into eclair
* changes:
  	new file:   LowStorageTest/Android.mk 	new file:   LowStorageTest/AndroidManifest.xml 	new file:   LowStorageTest/res/layout/main.xml 	new file:   LowStorageTest/res/values/strings.xml 	new file:   LowStorageTest/src/com/android/lowstoragetest/LowStorageTest.java Add the test app which can eat up 100% of the data parition. This is for the low storage test.
2009-09-08 16:30:42 -07:00
Amith Yamasani
698aba2e6b am e989496e: Merge change 24194 into eclair
Merge commit 'e989496e2bb7a64abe7336db1e728095ebc83a0c' into eclair-plus-aosp

* commit 'e989496e2bb7a64abe7336db1e728095ebc83a0c':
  Make the hardkeyboard long press dialog look the same as that of soft keyboard.
2009-09-08 15:36:28 -07:00
Android (Google) Code Review
741d117d1b Merge change 24194 into eclair
* changes:
  Make the hardkeyboard long press dialog look the same as that of soft keyboard.
2009-09-08 15:33:50 -07:00
Mathias Agopian
74f0347a7f am b80f6983: Merge changes 24119,24120 into eclair
Merge commit 'b80f698362e84b83e1c44c92fb76b0fdf1a5ef6d' into eclair-plus-aosp

* commit 'b80f698362e84b83e1c44c92fb76b0fdf1a5ef6d':
  delete old and unused source files
  fix [2068105] implement queueBuffer/lockBuffer/dequeueBuffer properly
2009-09-08 14:38:21 -07:00
Android (Google) Code Review
e116c043c8 Merge changes 24119,24120 into eclair
* changes:
  delete old and unused source files
  fix [2068105] implement queueBuffer/lockBuffer/dequeueBuffer properly
2009-09-08 14:36:06 -07:00
Costin Manolache
1c6ea1071f am b752098e: Sync status was ignoring account - the new UI has specific sync status for each account, so we need to use it.
Merge commit 'b752098e8d12d6e7925d97458078dbb896ca8a05' into eclair-plus-aosp

* commit 'b752098e8d12d6e7925d97458078dbb896ca8a05':
  Sync status was ignoring account - the new UI has specific sync status for each account, so we need to use it.
2009-09-08 14:10:35 -07:00
Nick Pelly
248a8e023b am 33b69050: Merge change 24155 into eclair
Merge commit '33b69050b2074c1768c45895418f0454e52e279a' into eclair-plus-aosp

* commit '33b69050b2074c1768c45895418f0454e52e279a':
  Add javadoc to explain which permissions are required for Public BT API's.
2009-09-08 13:43:05 -07:00
Joe Onorato
0a48bb8f74 am c19efc4a: Merge change 24183 into eclair
Merge commit 'c19efc4acb5a188650e0e04813899c0a143b4a96' into eclair-plus-aosp

* commit 'c19efc4acb5a188650e0e04813899c0a143b4a96':
  Fix b/2105945 - Windowshade not closed when device locked.
2009-09-08 13:42:16 -07:00
Dmitri Plotnikov
2a92c5f156 am 7452d292: Merge change 24086 into eclair
Merge commit '7452d292599b6ce3b13a52d13e514beac937838a' into eclair-plus-aosp

* commit '7452d292599b6ce3b13a52d13e514beac937838a':
  Fixing asymmetry between phone filter and email filter APIs.
2009-09-08 13:42:11 -07:00
Andreas Huber
547990ca47 am e0f64aae: Merge change 24178 into eclair
Merge commit 'e0f64aae8c02088be1c67bd97afc495e9098561c' into eclair-plus-aosp

* commit 'e0f64aae8c02088be1c67bd97afc495e9098561c':
  The qcom decoder requires that the output buffers be allocated by the component for hardware accelerated display to work.
2009-09-08 13:42:07 -07:00
Derek Sollenberger
f25742b095 am c3a30a00: Merge change 24153 into eclair
Merge commit 'c3a30a00333910268e2b93c58f14214b074aa929' into eclair-plus-aosp

* commit 'c3a30a00333910268e2b93c58f14214b074aa929':
  adding support for webkit plugins to use the java view system
2009-09-08 13:42:03 -07:00
James Dong
9bff1f2e72 am e05e02e1: Merge change 24094 into eclair
Merge commit 'e05e02e17463616c885784a1f0e57eeb22b13f93' into eclair-plus-aosp

* commit 'e05e02e17463616c885784a1f0e57eeb22b13f93':
  Add basic metadata retrieval support for midi, ogg, etc.
2009-09-08 13:41:59 -07:00
Cary Clark
8070acc2d2 am c18e9ed3: Merge change 24161 into eclair
Merge commit 'c18e9ed39c7cf68c1d946ef7c8533a3156181f86' into eclair-plus-aosp

* commit 'c18e9ed39c7cf68c1d946ef7c8533a3156181f86':
  don't fling if there's nowhere to go
2009-09-08 13:41:54 -07:00
Cary Clark
b93a6b32cb am f8d4964e: default overview mode to false in webkit
Merge commit 'f8d4964e45f7e671f4b333386b4269b23ced4750' into eclair-plus-aosp

* commit 'f8d4964e45f7e671f4b333386b4269b23ced4750':
  default overview mode to false in webkit
2009-09-08 13:41:50 -07:00
Derek Sollenberger
e6f77cbbdd am 377c5c15: Revert "Adding classes to enable plugins to use the java view system."
Merge commit '377c5c15f8fea14b575b6b0f14ac7fd3a4d44b3a' into eclair-plus-aosp

* commit '377c5c15f8fea14b575b6b0f14ac7fd3a4d44b3a':
  Revert "Adding classes to enable plugins to use the java view system."
2009-09-08 13:41:47 -07:00
Derek Sollenberger
7a4459cb3d am 67dffd93: Merge change 23485 into eclair
Merge commit '67dffd93e045e08e446df11e370597a9463f010c' into eclair-plus-aosp

* commit '67dffd93e045e08e446df11e370597a9463f010c':
  Adding classes to enable plugins to use the java view system.
2009-09-08 13:41:43 -07:00
Daisuke Miyakawa
9c9cf9a5d6 am 7390c5af: Merge change 24097 into eclair
Merge commit '7390c5af7a0c2379fa72218ea63a714f843edf0f' into eclair-plus-aosp

* commit '7390c5af7a0c2379fa72218ea63a714f843edf0f':
  Fix small bugs in VCardComposer.java.
2009-09-08 13:41:39 -07:00
Dianne Hackborn
4dd771428b am 0d23b82b: Fix 0%^&%!! SDK build.
Merge commit '0d23b82be2176e4beaa462bd50ff577819651b87' into eclair-plus-aosp

* commit '0d23b82be2176e4beaa462bd50ff577819651b87':
  Fix $#%^&%!! SDK build.
2009-09-08 13:41:35 -07:00
Dianne Hackborn
5a9f0caa18 am eb034652: Implement all of the infrastructure for configuring wallpapers.
Merge commit 'eb034652c2037a47ebfd99779e8383bb8bb528af' into eclair-plus-aosp

* commit 'eb034652c2037a47ebfd99779e8383bb8bb528af':
  Implement all of the infrastructure for configuring wallpapers.
2009-09-08 13:41:26 -07:00
Tammo Spalink
176131fdfc am 9c93007b: Merge change 24101 into eclair
Merge commit '9c93007bcdf684cd15fd9db0cf1eae238dd38191' into eclair-plus-aosp

* commit '9c93007bcdf684cd15fd9db0cf1eae238dd38191':
  Fix CDMA BCD unit test.
2009-09-08 13:41:23 -07:00
Tammo Spalink
3c83bac52f am 0b7044fe: Merge change 23413 into eclair
Merge commit '0b7044fe1136c546077291bb5d09aaee274800b2' into eclair-plus-aosp

* commit '0b7044fe1136c546077291bb5d09aaee274800b2':
  Rename SMSTest to GsmSmsTest.
2009-09-08 13:41:19 -07:00
Dianne Hackborn
b3b45263e5 am c916c044: Merge change 24099 into eclair
Merge commit 'c916c04495292c86051a2c31e90cca26a9bd99c1' into eclair-plus-aosp

* commit 'c916c04495292c86051a2c31e90cca26a9bd99c1':
  Fix issue #2095422: Some fades from opaque to transparent don't work
2009-09-08 13:41:07 -07:00
Dianne Hackborn
572fdc4526 am 510469fb: Merge change 24098 into eclair
Merge commit '510469fbe1ad44c3c6255afb236f51502b6960cc' into eclair-plus-aosp

* commit '510469fbe1ad44c3c6255afb236f51502b6960cc':
  Fix bug where we wouldn't release remote provider references.
2009-09-08 13:41:04 -07:00
Bjorn Bringert
c3c681d9e0 am 96f8613d: Add Gservices constants for GlobalSearch settings
Merge commit '96f8613d95122a491a44f755f06845cc2c13e81e' into eclair-plus-aosp

* commit '96f8613d95122a491a44f755f06845cc2c13e81e':
  Add Gservices constants for GlobalSearch settings
2009-09-08 13:41:00 -07:00
Owen Lin
f06cc6189a am d4344ba9: Merge change 23415 into eclair
Merge commit 'd4344ba9ba5091c7f10c927c3ca8917ee496e87b' into eclair-plus-aosp

* commit 'd4344ba9ba5091c7f10c927c3ca8917ee496e87b':
  Open some methods on PrefereneManager to allow others use the inflater.
2009-09-08 13:40:56 -07:00
Bob Lee
680c351fae am 88e62579: Merge change 24060 into eclair
Merge commit '88e625795943dea84b2e7c32f37e71303143b728' into eclair-plus-aosp

* commit '88e625795943dea84b2e7c32f37e71303143b728':
  Integrated the profiler into the framework. We run it all the time if the persist.sampling_profiler
2009-09-08 13:40:51 -07:00
Android (Google) Code Review
73c43911e7 Merge change 24155 into eclair
* changes:
  Add javadoc to explain which permissions are required for Public BT API's.
2009-09-08 13:37:10 -07:00
Android (Google) Code Review
573f161d82 Merge change 24183 into eclair
* changes:
  Fix b/2105945 - Windowshade not closed when device locked.
2009-09-08 13:30:19 -07:00
Android (Google) Code Review
11cb2d307b Merge change 24086 into eclair
* changes:
  Fixing asymmetry between phone filter and email filter APIs.
2009-09-08 13:21:39 -07:00
Android (Google) Code Review
88addc00cd Merge change 24178 into eclair
* changes:
  The qcom decoder requires that the output buffers be allocated by the component for hardware accelerated display to work.
2009-09-08 13:07:45 -07:00
Android (Google) Code Review
71da9f8f1a Merge change 24153 into eclair
* changes:
  adding support for webkit plugins to use the java view system
2009-09-08 12:53:17 -07:00
Android (Google) Code Review
51e458273f Merge change 24094 into eclair
* changes:
  Add basic metadata retrieval support for midi, ogg, etc. Bug 2050320
2009-09-08 12:39:56 -07:00
Android (Google) Code Review
61989f7fce Merge change 24161 into eclair
* changes:
  don't fling if there's nowhere to go
2009-09-08 11:29:28 -07:00
Android (Google) Code Review
2fbea26f09 Merge change 23485 into eclair
* changes:
  Adding classes to enable plugins to use the java view system.
2009-09-08 05:48:06 -07:00
Android (Google) Code Review
f436e455fd Merge change 24097 into eclair
* changes:
  Fix small bugs in VCardComposer.java.
2009-09-08 01:23:05 -07:00
Android (Google) Code Review
16878ab4d1 Merge change 24101 into eclair
* changes:
  Fix CDMA BCD unit test.
2009-09-07 21:02:29 -07:00
Android (Google) Code Review
0bd393aece Merge change 23413 into eclair
* changes:
  Rename SMSTest to GsmSmsTest.
2009-09-07 20:55:08 -07:00
Mathias Agopian
8837e2f2e6 delete old and unused source files 2009-09-07 16:33:36 -07:00
Mathias Agopian
cbb288bfe8 fix [2068105] implement queueBuffer/lockBuffer/dequeueBuffer properly
Rewrote SurfaceFlinger's buffer management from the ground-up.
The design now support an arbitrary number of buffers per surface, however the current implementation is limited to four. Currently only 2 buffers are used in practice.

The main new feature is to be able to dequeue all buffers at once (very important when there are only two). 

A client can dequeue all buffers until there are none available, it can lock all buffers except the last one that is used for composition. The client will block then, until a new buffer is enqueued.

The current implementation requires that buffers are locked in the same order they are dequeued and enqueued in the same order they are locked. Only one buffer can be locked at a time.

eg. Allowed sequence:   DQ, DQ, LOCK, Q, LOCK, Q
eg. Forbidden sequence: DQ, DQ, LOCK, LOCK, Q, Q
2009-09-07 16:32:45 -07:00
Android (Google) Code Review
9a20eb44a2 Merge change 24099 into eclair
* changes:
  Fix issue #2095422: Some fades from opaque to transparent don't work
2009-09-07 10:16:20 -07:00
Android (Google) Code Review
ac21771848 Merge change 24098 into eclair
* changes:
  Fix bug where we wouldn't release remote provider references.
2009-09-07 10:14:44 -07:00
Android (Google) Code Review
5c22caf7a8 Merge change 23415 into eclair
* changes:
  Open some methods on PrefereneManager to allow others use the inflater.
2009-09-07 03:25:56 -07:00
Android (Google) Code Review
20ef5001d7 Merge change 24060 into eclair
* changes:
  Integrated the profiler into the framework. We run it all the time if the persist.sampling_profiler system property is set. Saves snapshots to the SD card.
2009-09-06 16:41:35 -07:00
San Mehat
19a6c4f781 am a4eb91da: dumpstate: Add the ctime (time the file was harvested out of /proc) to dump.
Merge commit 'a4eb91da03bd785bc91bed0d25a9efaa9baba1c1' into eclair-plus-aosp

* commit 'a4eb91da03bd785bc91bed0d25a9efaa9baba1c1':
  dumpstate: Add the ctime (time the file was harvested out of /proc) to dump.
2009-09-05 15:33:10 -07:00