Jack Palevich
fd3f7d68af
am 90ce68a9: (-s ours) am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair
...
Merge commit '90ce68a99f8803643d83be963aa0f28fa952a186'
* commit '90ce68a99f8803643d83be963aa0f28fa952a186':
DO NOT MERGE A library for encoding and decoding ETC1 textures.
2010-01-11 13:00:36 -08:00
Vasu Nori
a7a02f9ecb
am 9c74295f: am a1759cea: Merge "add eventlog message whenever sqlite reports db corruption error" into eclair
...
Merge commit '9c74295fb16da0469304a7c04c471915e28d09bd'
* commit '9c74295fb16da0469304a7c04c471915e28d09bd':
add eventlog message whenever sqlite reports db corruption error
2010-01-11 13:00:28 -08:00
Scott Main
ee76c1cbeb
am c9a26f29: am aa3b5961: javadoc change: fix the selector sample XML in the class description (was broken due to improper ordering)
...
Merge commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d'
* commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d':
javadoc change: fix the selector sample XML in the class
2010-01-11 13:00:14 -08:00
Mike Lockwood
389e94b37a
Merge "Unhide LocationManager APIs needed for unbundled location providers."
2010-01-11 10:48:51 -08:00
Andrei Popescu
c2398cfd06
Merge "Allow a video to be correctly resumed programatically after being paused."
2010-01-11 10:47:23 -08:00
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
Jack Palevich
91ea437c47
am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair
...
Merge commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5' into eclair-plus-aosp
* commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5':
DO NOT MERGE A library for encoding and decoding ETC1 textures.
2010-01-09 21:54:28 -08:00
Jack Palevich
8577a7d452
Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair
2010-01-09 21:51:05 -08:00
Vasu Nori
370c36a175
am a1759cea: Merge "add eventlog message whenever sqlite reports db corruption error" into eclair
...
Merge commit 'a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd' into eclair-plus-aosp
* commit 'a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd':
add eventlog message whenever sqlite reports db corruption error
2010-01-08 16:33:50 -08:00
Scott Main
86a34cbd6d
am aa3b5961: javadoc change: fix the selector sample XML in the class description (was broken due to improper ordering)
...
Merge commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea' into eclair-plus-aosp
* commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea':
javadoc change: fix the selector sample XML in the class
2010-01-08 16:33:45 -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
Vasu Nori
a1322cae44
Merge "add eventlog message whenever sqlite reports db corruption error" into eclair
2010-01-08 15:09:12 -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
Jack Palevich
618c755192
DO NOT MERGE A library for encoding and decoding ETC1 textures.
...
The ETC1 compressed texture format is commonly
supported by OpenGL ES 2.0-capable devices.
This change adds a host-only version of the library. It is used by
the etc1tool.
2010-01-08 16:00:21 +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