San Mehat
e669f3d27f
Merge "MountService: Clean up some logspam"
2010-01-11 10:10:10 -08:00
Bjorn Bringert
6f71b35998
Merge "Copy SearchSourceSelector from QuickSearchBox"
2010-01-11 08:39:24 -08:00
Leon Scroggins
fbc76a3f6e
am ff7d33b5: am 04e0a101: Bring up IME after receiving a response from webkit.
...
Merge commit 'ff7d33b55b799b234f66fdcf65070ef590fee6d9'
* commit 'ff7d33b55b799b234f66fdcf65070ef590fee6d9':
Bring up IME after receiving a response from webkit.
2010-01-11 06:58:51 -08:00
Leon Scroggins
7e0838af61
am 04e0a101: Bring up IME after receiving a response from webkit.
...
Merge commit '04e0a1018f69b38827e63a7f19a4d1e341f9725a' into eclair-mr2-plus-aosp
* commit '04e0a1018f69b38827e63a7f19a4d1e341f9725a':
Bring up IME after receiving a response from webkit.
2010-01-11 06:42:13 -08:00
Daniel Sandler
07239e2c34
am cffea95e: (-s ours) am 3fb4ee4e: Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair
...
Merge commit 'cffea95e1ef203223b87ae8a6bde415b25c5c415'
* commit 'cffea95e1ef203223b87ae8a6bde415b25c5c415':
Immediately close the shade when the status bar is disabled. (DO NOT MERGE)
2010-01-08 16:33:00 -08:00
Eric Laurent
7ca087c1dc
am d31d7397: am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.
...
Merge commit 'd31d7397ba26dcd913e96d06f0a8fd593780d629'
* commit 'd31d7397ba26dcd913e96d06f0a8fd593780d629':
Fix issue 2361949: A2DP suspend parameters set wrongly.
2010-01-08 16:28:21 -08:00
Romain Guy
3150097fb0
Merge "Deprecate fill_parent and introduce match_parent. Bug: #2361749."
2010-01-08 15:32:18 -08:00
Charles Chen
83c7cfe2cb
Merge "Enabling multiple apps to use different speech synthesis engines and not interfere with one another."
2010-01-08 15:26:57 -08:00
Jean-Michel Trivi
1760b7cad5
Merge "Remove useless start of AudioTrack for TTS and improper volume setting. The AudioTrack that plays the synthesized audio data should only be started when the first synthesis request is sent, not after the initialization of the engine. The track volume should be initialized to it nominal level. Volumes above 1 do not provide amplification, so setting the volume to 2 is not necessary."
2010-01-08 15:21:39 -08:00
Romain Guy
e8b6618c4c
Deprecate fill_parent and introduce match_parent.
...
Bug: #2361749 .
2010-01-08 15:11:38 -08:00
San Mehat
e965dda18b
Merge "MountService: Add new Settings for UMS prompting and notification behavior"
2010-01-08 15:05:57 -08:00
San Mehat
a836f7187f
Merge "Settings: Add settings for MountService prefs and bump DB version to 46"
2010-01-08 15:03:43 -08:00
Mike Reed
714fbe5571
Merge "explicitly initialize static final boolean to fix build"
2010-01-08 14:36:52 -08:00
Andreas Huber
1d8778f7aa
Merge "Reorganize some of the stagefright implementation related to metadata."
2010-01-08 14:09:01 -08:00
Mike Reed
7f34c55314
Merge "optional flag to enable tracker debugging"
2010-01-08 13:34:54 -08:00
Tom O'Neill
20817a4496
Merge "ContentResolver.query() includes performance considerations"
2010-01-08 13:04:56 -08:00
Joe Onorato
51632e800a
less log spew
2010-01-08 15:46:24 -05:00
San Mehat
3e0a34ff32
Merge "MountService: Fix asec list bug"
2010-01-08 12:38:24 -08:00
Daniel Sandler
1eea5185e5
am 3fb4ee4e: Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair
...
Merge commit '3fb4ee4e03351078ceadf3d8dd05789ae152e8dd' into eclair-plus-aosp
* commit '3fb4ee4e03351078ceadf3d8dd05789ae152e8dd':
Immediately close the shade when the status bar is disabled. (DO NOT MERGE)
2010-01-08 12:33:17 -08:00
Daniel Sandler
8fe921768f
Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair
2010-01-08 12:31:03 -08:00
Eric Laurent
ac5002e716
am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.
...
Merge commit '663ec308801a34de82db9ab993f0e906da690f89' into eclair-plus-aosp
* commit '663ec308801a34de82db9ab993f0e906da690f89':
Fix issue 2361949: A2DP suspend parameters set wrongly.
2010-01-08 12:17:08 -08:00
Erik Pasternak
c0ce7a6aad
Merge "b/2293263 Finished removing busyBits references."
2010-01-08 10:45:35 -08:00
Eric Fischer
9823a92167
Merge "Update with latest translations."
2010-01-08 10:00:58 -08:00
Andrei Popescu
0e34ec2c58
Merge "Fix a bug where the usage for an origin shows up as 0 in Website Settings when the origin uses app cache but not database."
2010-01-08 09:49:31 -08:00
Patrick Scott
98de6c4a91
Merge "Deprecate onTooManyRedirects."
2010-01-08 09:23:44 -08:00
Vasu Nori
455499ce1f
Merge "when finalizing SQLiteCursor, close it but don't throw exceptions."
2010-01-08 09:21:31 -08:00
Doug Zongker
3f83f7ec41
Merge "remove Settings.Gservices"
2010-01-08 08:41:17 -08:00
San Mehat
d4ed21ea58
Merge "Environment: Catch *all* exceptions from MountService"
2010-01-08 07:19:56 -08:00
Leon Scroggins
a79b658c9f
am 4e9a9d8e: am c89b13b9: Use Calendar.add() instead of Calendar.roll()
...
Merge commit '4e9a9d8ea8a31578b936b17f66177f4c1b18cddb'
* commit '4e9a9d8ea8a31578b936b17f66177f4c1b18cddb':
Use Calendar.add() instead of Calendar.roll()
2010-01-08 06:48:21 -08:00
Cary Clark
27b37bc29d
am 2110bb02: am affa5d2c: remove unused jni interfaces
...
Merge commit '2110bb024eafe4578bb9acace9f1ad4ae55ff9fd'
* commit '2110bb024eafe4578bb9acace9f1ad4ae55ff9fd':
remove unused jni interfaces
2010-01-08 06:48:08 -08:00
Leon Scroggins
a9dc0f7f88
am c89b13b9: Use Calendar.add() instead of Calendar.roll()
...
Merge commit 'c89b13b962c6634db536e563a42d058702ce045b' into eclair-mr2-plus-aosp
* commit 'c89b13b962c6634db536e563a42d058702ce045b':
Use Calendar.add() instead of Calendar.roll()
2010-01-08 06:43:36 -08:00
Dan Egnor
4cd85bb32d
Merge "Bumper un-@hide (un-@pending actually) of previously reviewed APIs:"
2010-01-07 19:16:34 -08:00
Trevor Johns
f34a7a7087
am f6de904a: am 063d03ed: Converting tabs to spaces in docs/html/resources/resources_toc.cs.
...
Merge commit 'f6de904a3c62895c691ce82dbf84e2abf0bdd019'
* commit 'f6de904a3c62895c691ce82dbf84e2abf0bdd019':
Converting tabs to spaces in docs/html/resources/resources_toc.cs.
2010-01-07 19:02:03 -08:00
Trevor Johns
aac9e9f3fa
am 063d03ed: Converting tabs to spaces in docs/html/resources/resources_toc.cs.
...
Merge commit '063d03ed0882582840c7db610635aa89c1a01eec' into eclair-plus-aosp
* commit '063d03ed0882582840c7db610635aa89c1a01eec':
Converting tabs to spaces in docs/html/resources/resources_toc.cs.
2010-01-07 18:58:35 -08:00
Doug Zongker
c901f0fc1a
Merge "remove GoogleWebContentHelper class"
2010-01-07 18:14:05 -08:00
Doug Zongker
cf504c40b2
change remaining frameworks/base Gservices to Secure settings
...
Change-Id: I61bdb05a2526523700c2833154d5a4133881ef10
2010-01-07 15:00:37 -08:00
Erik Pasternak
072ba687d6
Merge "b/2358627 and b/2293263 Fixed eventDay bugs."
2010-01-07 13:52:08 -08:00
Dirk Dougherty
122b788514
am 5f6002ec: am d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair
...
Merge commit '5f6002ec5f52ed164b591cf4b267fe771a81731f'
* commit '5f6002ec5f52ed164b591cf4b267fe771a81731f':
SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
2010-01-07 12:37:15 -08:00
Dirk Dougherty
e70b5fca84
am d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair
...
Merge commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5' into eclair-plus-aosp
* commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5':
SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
2010-01-07 12:33:48 -08:00
Dirk Dougherty
8fc26bc215
Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair
2010-01-07 12:30:14 -08:00
San Mehat
4c6a4cc2e1
Merge "PowerManagerService: Switch to using MountService shutdown for media"
2010-01-07 11:35:29 -08:00
San Mehat
5da3fd5c5a
Merge "MountService: Add an ACTION_SHUTDOWN handler and export a method for external shutdown"
2010-01-07 11:35:23 -08:00
Scott Main
cc8fb61bae
am 707ca41d: am d8858893: Merge "docs: fix some broken links" into eclair
...
Merge commit '707ca41d1f93e54aa0abcf3455522ba8d4c8affb'
* commit '707ca41d1f93e54aa0abcf3455522ba8d4c8affb':
docs: fix some broken links
2010-01-07 10:26:49 -08:00
Scott Main
5c7069a340
am d8858893: Merge "docs: fix some broken links" into eclair
...
Merge commit 'd88588935e3a09b4b13753d55dbe8a8e9ed240a1' into eclair-plus-aosp
* commit 'd88588935e3a09b4b13753d55dbe8a8e9ed240a1':
docs: fix some broken links
2010-01-07 10:21:52 -08:00
Cary Clark
c186005f69
am affa5d2c: remove unused jni interfaces
...
Merge commit 'affa5d2c0f7c2ade43ded5ff9a7952b269183117' into eclair-mr2-plus-aosp
* commit 'affa5d2c0f7c2ade43ded5ff9a7952b269183117':
remove unused jni interfaces
2010-01-07 10:19:56 -08:00
Scott Main
e90d1b1f60
Merge "docs: fix some broken links" into eclair
2010-01-07 10:18:45 -08:00
Dan Egnor
29bff34cce
Merge "Remove old EventLog tests from here, they will be replaced by a (better) EventLog test in CTS."
2010-01-07 09:42:57 -08:00
Doug Zongker
74a5c34802
Merge "move Watchdog's settings from Gservices to Secure"
2010-01-07 09:24:01 -08:00
Xavier Ducrohet
4b83794c88
am de0ef181: am ce60d4b2: Merge "Move Layoutlib API library to sdk.git" into eclair
...
Merge commit 'de0ef181516ce13d292eafb741fa6c6b9dc1cb1c'
* commit 'de0ef181516ce13d292eafb741fa6c6b9dc1cb1c':
Move Layoutlib API library to sdk.git
2010-01-07 09:22:16 -08:00
Jaikumar Ganesh
2133a9f10b
am 2790b20c: am 0b6c6f2c: Merge "Fix media option settings for A2DP." into eclair
...
Merge commit '2790b20c537b33dbf366436f6d27776148ded490'
* commit '2790b20c537b33dbf366436f6d27776148ded490':
Fix media option settings for A2DP.
2010-01-07 09:22:04 -08:00