8216 Commits

Author SHA1 Message Date
Chung-yih Wang
591a16220b am 53fb67a8: am 0c065d9e: Merge change 24117 into eclair
Merge commit '53fb67a8196e75965a5042fdbd83d266980420d9'

* commit '53fb67a8196e75965a5042fdbd83d266980420d9':
  Replace the delimiter whitespace with '\0'.
2009-09-09 13:42:15 -07:00
Eric Laurent
7fae310537 am d3a31996: am db603b0b: Merge change 24114 into eclair
Merge commit 'd3a31996e6ef915bc25ff67f1f35274447a14862'

* commit 'd3a31996e6ef915bc25ff67f1f35274447a14862':
  Fix issue 1992233: DTMF tones on Sholes is really long.
2009-09-09 13:41:53 -07:00
Tammo Spalink
54807f3b5e am e579dc1c: am 997eddb0: Merge change 24318 into eclair
Merge commit 'e579dc1cc55648c3b8b81560214c47c9adee81f1'

* commit 'e579dc1cc55648c3b8b81560214c47c9adee81f1':
  Avoid CDMA messages with IDs of zero.
2009-09-09 13:41:40 -07:00
Omari Stephens
99af2813e0 am c5e15ad7: am 948ef29e: Merge change 24316 into eclair
Merge commit 'c5e15ad767b4ff92d4eb85655b6e5fd517c0ae93'

* commit 'c5e15ad767b4ff92d4eb85655b6e5fd517c0ae93':
  Fix typo: IMMEDITATE -> IMMEDIATE
2009-09-09 13:41:17 -07:00
Tammo Spalink
091ecf7e81 am 71a9687e: am 0a46e913: Merge change 23414 into eclair
Merge commit '71a9687e8baa9ad7ae594e6cb66a14e82d71b237'

* commit '71a9687e8baa9ad7ae594e6cb66a14e82d71b237':
  Fix broken GSM SMS unit test, and general cleanup.
2009-09-09 10:59:36 -07:00
Yu Shan Emily Lau
86b2d7c54d am ec00bcbe: am bde54df0: modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the incorrect expected druation
Merge commit 'ec00bcbe544c342a6de892a7d5427acfe7579a1a'

* commit 'ec00bcbe544c342a6de892a7d5427acfe7579a1a':
  modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
2009-09-09 10:59:18 -07:00
Fred Quintana
be5bc78a98 am f43d282d: am b0dccf73: Merge change 24012 into eclair
Merge commit 'f43d282dc7ed88e6d018fa3729da568af8b58158'

* commit 'f43d282dc7ed88e6d018fa3729da568af8b58158':
  add a transaction monitor
2009-09-09 10:58:43 -07:00
Eric Fischer
7bbfdb2bf1 am 817f3cb4: (-s ours) am 046263ce: Merge change 24220 into eclair
Merge commit '817f3cb41bd5a412f50c131094cf52e04eab9141'

* commit '817f3cb41bd5a412f50c131094cf52e04eab9141':
  Import revised translations.  DO NOT MERGE
2009-09-09 10:56:38 -07:00
Yu Shan Emily Lau
7a9ed089a8 am 0f69788f: am 9bb1101f: Merge change 23924 into eclair
Merge commit '0f69788f62486f5759e16911effd4bbd9395bcce'

* commit '0f69788f62486f5759e16911effd4bbd9395bcce':
  new file:   LowStorageTest/Android.mk
2009-09-09 10:56:14 -07:00
Chung-yih Wang
53fb67a819 am 0c065d9e: Merge change 24117 into eclair
Merge commit '0c065d9ef17ad9e045391bab3630a49fb998250c' into eclair-plus-aosp

* commit '0c065d9ef17ad9e045391bab3630a49fb998250c':
  Replace the delimiter whitespace with '\0'.
2009-09-09 00:41:54 -07:00
Android (Google) Code Review
0c065d9ef1 Merge change 24117 into eclair
* changes:
  Replace the delimiter whitespace with '\0'.
2009-09-09 00:40:17 -07:00
Chung-yih Wang
801b73f661 Replace the delimiter whitespace with '\0'.
+ Use '\0' as the delimiter.
+ Allow whitespace character for keystore password.

In previous implementation, we use space as the delimiter. That
will stop user from using passphrase with whitespace character.
2009-09-09 15:00:43 +08:00
Eric Laurent
d3a31996e6 am db603b0b: Merge change 24114 into eclair
Merge commit 'db603b0b2c7c06ea78b8aa0bdc7ea8f08b335c3d' into eclair-plus-aosp

* commit 'db603b0b2c7c06ea78b8aa0bdc7ea8f08b335c3d':
  Fix issue 1992233: DTMF tones on Sholes is really long.
2009-09-08 23:07:51 -07:00
Android (Google) Code Review
db603b0b2c Merge change 24114 into eclair
* changes:
  Fix issue 1992233: DTMF tones on Sholes is really long.
2009-09-08 23:04:38 -07:00
Tammo Spalink
e579dc1cc5 am 997eddb0: Merge change 24318 into eclair
Merge commit '997eddb0a0a069ea627e8b07d41d7ffdbc12c53d' into eclair-plus-aosp

* commit '997eddb0a0a069ea627e8b07d41d7ffdbc12c53d':
  Avoid CDMA messages with IDs of zero.
2009-09-08 22:58:52 -07:00
Eric Laurent
96c08a69ea Fix issue 1992233: DTMF tones on Sholes is really long.
Add a parameter to ToneGenerator.startTone() allowing the caller to specify the tone duration. This is used by the phone application to have a precise control on the DTMF tone duration which was not possible with the use of delayed messaged.
Also modified AudioFlinger output threads so that 0s are written to the audio output stream when no more tracks are ready to mix instead of just sleeping. This avoids an issue where the end of a previous DTMF tone could stay in audio hardware buffers and be played just before the beginning of the next DTMF tone.
2009-09-08 22:56:07 -07:00
Android (Google) Code Review
997eddb0a0 Merge change 24318 into eclair
* changes:
  Avoid CDMA messages with IDs of zero.
2009-09-08 22:55:49 -07:00
Tammo Spalink
98a5ba78f9 Avoid CDMA messages with IDs of zero.
In reference to issue:
http://buganizer/issue?id=2047571

Change-Id: I88b5cdbb988f12206663bbb3fdc9508a437b19ad
2009-09-09 13:50:07 +08:00
Omari Stephens
c5e15ad767 am 948ef29e: Merge change 24316 into eclair
Merge commit '948ef29ebacde30bc2f1283b5e6d86f2413698c4' into eclair-plus-aosp

* commit '948ef29ebacde30bc2f1283b5e6d86f2413698c4':
  Fix typo: IMMEDITATE -> IMMEDIATE
2009-09-08 21:03:48 -07:00
Android (Google) Code Review
948ef29eba Merge change 24316 into eclair
* changes:
  Fix typo: IMMEDITATE -> IMMEDIATE
2009-09-08 21:00:29 -07:00
Tammo Spalink
71a9687e8b am 0a46e913: Merge change 23414 into eclair
Merge commit '0a46e91357def02cbc6a5449c86763f4350850db' into eclair-plus-aosp

* commit '0a46e91357def02cbc6a5449c86763f4350850db':
  Fix broken GSM SMS unit test, and general cleanup.
2009-09-08 19:43:42 -07:00
Android (Google) Code Review
0a46e91357 Merge change 23414 into eclair
* changes:
  Fix broken GSM SMS unit test, and general cleanup.
2009-09-08 19:41:13 -07:00
Omari Stephens
bc9aa775ae Fix typo: IMMEDITATE -> IMMEDIATE 2009-09-08 19:10:53 -07:00
Yu Shan Emily Lau
ec00bcbe54 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
Yu Shan Emily Lau
bde54df020 modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
Fixed the incorrect expected druation
2009-09-08 18:55:01 -07:00
Fred Quintana
f43d282dc7 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
b0dccf73dd Merge change 24012 into eclair
* changes:
  add a transaction monitor
2009-09-08 17:26:25 -07:00
Fred Quintana
c4516a7b62 add a transaction monitor 2009-09-08 17:25:09 -07:00
Eric Fischer
817f3cb41b 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
046263ce35 Merge change 24220 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-09-08 16:58:33 -07:00
Eric Fischer
5cacfb9df2 Import revised translations. DO NOT MERGE 2009-09-08 16:54:05 -07:00
Yu Shan Emily Lau
0f69788f62 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
9bb1101f5c 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
359c140620 am e8ffb1da: am e989496e: Merge change 24194 into eclair
Merge commit 'e8ffb1da28b397422ec67c93577abe37f0561228'

* commit 'e8ffb1da28b397422ec67c93577abe37f0561228':
  Make the hardkeyboard long press dialog look the same as that of soft keyboard.
2009-09-08 16:03:46 -07:00
Mathias Agopian
0c2b3fdc01 am d34958c5: am b80f6983: Merge changes 24119,24120 into eclair
Merge commit 'd34958c5b96def3093d1c68265bfece79615ff9a'

* commit 'd34958c5b96def3093d1c68265bfece79615ff9a':
  delete old and unused source files
  fix [2068105] implement queueBuffer/lockBuffer/dequeueBuffer properly
2009-09-08 16:03:26 -07:00
Costin Manolache
5e97766a42 am 93c2b332: 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 '93c2b332ce0f36d7774e33db1954f8a780b20ba6'

* commit '93c2b332ce0f36d7774e33db1954f8a780b20ba6':
  Sync status was ignoring account - the new UI has specific sync status for each account, so we need to use it.
2009-09-08 16:03:18 -07:00
Nick Pelly
187320fa70 am 328b53b5: am 33b69050: Merge change 24155 into eclair
Merge commit '328b53b58b06b07369b6238dd6ba234194e3b456'

* commit '328b53b58b06b07369b6238dd6ba234194e3b456':
  Add javadoc to explain which permissions are required for Public BT API's.
2009-09-08 16:02:02 -07:00
Joe Onorato
49ff3692c1 am f6b1edb3: am c19efc4a: Merge change 24183 into eclair
Merge commit 'f6b1edb3af8bd1297888fd083aad39a825f4591e'

* commit 'f6b1edb3af8bd1297888fd083aad39a825f4591e':
  Fix b/2105945 - Windowshade not closed when device locked.
2009-09-08 16:01:59 -07:00
Dmitri Plotnikov
feaa563a63 am 8544a349: am 7452d292: Merge change 24086 into eclair
Merge commit '8544a349837596ff8889abf3f564c35bb5a1c51a'

* commit '8544a349837596ff8889abf3f564c35bb5a1c51a':
  Fixing asymmetry between phone filter and email filter APIs.
2009-09-08 16:01:55 -07:00
Andreas Huber
0b3d7c7cf3 am 04cae64e: am e0f64aae: Merge change 24178 into eclair
Merge commit '04cae64ed10454c549f19b22560459f36861d0c6'

* commit '04cae64ed10454c549f19b22560459f36861d0c6':
  The qcom decoder requires that the output buffers be allocated by the component for hardware accelerated display to work.
2009-09-08 16:01:52 -07:00
Derek Sollenberger
ac6d106643 am af4ce5bd: am c3a30a00: Merge change 24153 into eclair
Merge commit 'af4ce5bd00be6fd3319c7cdcc3ddf27ac81ac24e'

* commit 'af4ce5bd00be6fd3319c7cdcc3ddf27ac81ac24e':
  adding support for webkit plugins to use the java view system
2009-09-08 16:01:47 -07:00
James Dong
8eb47de961 am 366f2e61: am e05e02e1: Merge change 24094 into eclair
Merge commit '366f2e61fe78488f1a01187cbdb2e1a8e776777c'

* commit '366f2e61fe78488f1a01187cbdb2e1a8e776777c':
  Add basic metadata retrieval support for midi, ogg, etc.
2009-09-08 16:01:44 -07:00
Cary Clark
af7996479b am e9aab295: am c18e9ed3: Merge change 24161 into eclair
Merge commit 'e9aab295739992c763f070d9fdffcce95d15d2af'

* commit 'e9aab295739992c763f070d9fdffcce95d15d2af':
  don't fling if there's nowhere to go
2009-09-08 16:01:40 -07:00
Cary Clark
4b60422353 am 7ac6cf9d: am f8d4964e: default overview mode to false in webkit
Merge commit '7ac6cf9d9e6928b85ae4c4c35a515ce7111de066'

* commit '7ac6cf9d9e6928b85ae4c4c35a515ce7111de066':
  default overview mode to false in webkit
2009-09-08 16:01:37 -07:00
Derek Sollenberger
8a46f64803 am bfe76e4f: am 377c5c15: Revert "Adding classes to enable plugins to use the java view system."
Merge commit 'bfe76e4f7b08882cf419f93e3511e90f59774ca7'

* commit 'bfe76e4f7b08882cf419f93e3511e90f59774ca7':
  Revert "Adding classes to enable plugins to use the java view system."
2009-09-08 16:01:33 -07:00
Derek Sollenberger
7e670ea545 am 96d97921: am 67dffd93: Merge change 23485 into eclair
Merge commit '96d979212f3e2548f1fcfad8208f81b895d80087'

* commit '96d979212f3e2548f1fcfad8208f81b895d80087':
  Adding classes to enable plugins to use the java view system.
2009-09-08 16:01:30 -07:00
Daisuke Miyakawa
5851d3bf92 am 71881682: am 7390c5af: Merge change 24097 into eclair
Merge commit '718816821564b61301b0ea93423f7d9d47c2d555'

* commit '718816821564b61301b0ea93423f7d9d47c2d555':
  Fix small bugs in VCardComposer.java.
2009-09-08 16:01:26 -07:00
Dianne Hackborn
50e1069cf0 am c66e6851: am 0d23b82b: Fix 0%^&%!! SDK build.
Merge commit 'c66e685115b45667ad67372fbf769c6f2dd52b1f'

* commit 'c66e685115b45667ad67372fbf769c6f2dd52b1f':
  Fix $#%^&%!! SDK build.
2009-09-08 16:01:23 -07:00
Dianne Hackborn
3331da069c am da2e19c6: am eb034652: Implement all of the infrastructure for configuring wallpapers.
Merge commit 'da2e19c6ad5c153d87c8da1a695e5e823d17e29b'

* commit 'da2e19c6ad5c153d87c8da1a695e5e823d17e29b':
  Implement all of the infrastructure for configuring wallpapers.
2009-09-08 16:01:18 -07:00
Tammo Spalink
b4b2f55728 am 2164a256: am 9c93007b: Merge change 24101 into eclair
Merge commit '2164a2566e9af7e46000d8683ec6b472aa74ecb0'

* commit '2164a2566e9af7e46000d8683ec6b472aa74ecb0':
  Fix CDMA BCD unit test.
2009-09-08 16:01:14 -07:00